Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/minix/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int minix_readdir(struct file *file, struct dir_context *ctx) 
	unsigned offset;

	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)

		return 0;