Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 642b704cd7a29be0b8900971eb525086c1c995b7

Authored by Dan Carpenter
Committed by Al Viro
1 parent 18c67cb9f0
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

minix: bug widening a binary "not" operation 

"chunk_size" is an unsigned int and "pos" is an unsigned long.  The
"& ~(chunk_size-1)" operation clears the high 32 bits unintentionally.

The ALIGN() macro does the correct thing.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -93,7 +93,7 @@
93 93 unsigned offset;
94 94 unsigned long n;
95 95  
96   - ctx->pos = pos = (pos + chunk_size-1) & ~(chunk_size-1);
  96 + ctx->pos = pos = ALIGN(pos, chunk_size);
97 97 if (pos >= inode->i_size)
98 98 return 0;
99 99