Commit d620a7cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: Fix accesses at LBA28 boundary (old bug, but nasty) (v2)
parents 2aedd192 45c4d015

include/linux/ata.h

+2 −2
Original line number Diff line number Diff line
@@ -1025,8 +1025,8 @@ static inline int ata_ok(u8 status) 


static inline int lba_28_ok(u64 block, u32 n_block)

{

	/* check the ending block number */

	return ((block + n_block) < ((u64)1 << 28)) && (n_block <= 256);

	/* check the ending block number: must be LESS THAN 0x0fffffff */

	return ((block + n_block) < ((1 << 28) - 1)) && (n_block <= 256);

}



static inline int lba_48_ok(u64 block, u32 n_block)