diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-17 21:21:56 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-31 21:17:31 +0200 |
| commit | 1d7095c72d35eee4ebc28e66563e636b9adafeb2 (patch) | |
| tree | 9af1a639bd7a26c7c4d77506eef615153fef2a79 | |
| parent | fix buffer leak after "scsi: saner replacements for ->proc_info()" (diff) | |
| download | linux-1d7095c72d35eee4ebc28e66563e636b9adafeb2.tar.xz linux-1d7095c72d35eee4ebc28e66563e636b9adafeb2.zip | |
qnx6: qnx6_readdir() has a braino in pos calculation
We want to mask lower 5 bits out, not leave only those and clear the
rest... As it is, we end up always starting to read from the beginning
of directory, no matter what the current position had been.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/qnx6/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/qnx6/dir.c b/fs/qnx6/dir.c index 8798d065e400..afa6be6fc397 100644 --- a/fs/qnx6/dir.c +++ b/fs/qnx6/dir.c @@ -120,7 +120,7 @@ static int qnx6_readdir(struct file *filp, void *dirent, filldir_t filldir) struct inode *inode = file_inode(filp); struct super_block *s = inode->i_sb; struct qnx6_sb_info *sbi = QNX6_SB(s); - loff_t pos = filp->f_pos & (QNX6_DIR_ENTRY_SIZE - 1); + loff_t pos = filp->f_pos & ~(QNX6_DIR_ENTRY_SIZE - 1); unsigned long npages = dir_pages(inode); unsigned long n = pos >> PAGE_CACHE_SHIFT; unsigned start = (pos & ~PAGE_CACHE_MASK) / QNX6_DIR_ENTRY_SIZE; |