Commit 642b704c authored by Dan Carpenter's avatar Dan Carpenter Committed by Al Viro

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 18c67cb9
...@@ -93,7 +93,7 @@ static int minix_readdir(struct file *file, struct dir_context *ctx) ...@@ -93,7 +93,7 @@ static int minix_readdir(struct file *file, struct dir_context *ctx)
unsigned offset; unsigned offset;
unsigned long n; unsigned long n;
ctx->pos = pos = (pos + chunk_size-1) & ~(chunk_size-1); ctx->pos = pos = ALIGN(pos, chunk_size);
if (pos >= inode->i_size) if (pos >= inode->i_size)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment