Message ID | 20220624165631.2124632-2-Jason@zx2c4.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/6] ksmbd: use vfs_llseek instead of dereferencing NULL | expand |
On Fri, Jun 24, 2022 at 06:56:26PM +0200, Jason A. Donenfeld wrote: > By not checking whether llseek is NULL, this might jump to NULL. Also, > it doesn't check FMODE_LSEEK. Fix this by using vfs_llseek(), which > always does the right thing. Acked-by: Al Viro <viro@zeniv.linux.org.uk>
2022-06-25 1:56 GMT+09:00, Jason A. Donenfeld <Jason@zx2c4.com>: > By not checking whether llseek is NULL, this might jump to NULL. Also, > it doesn't check FMODE_LSEEK. Fix this by using vfs_llseek(), which > always does the right thing. > > Fixes: f44158485826 ("cifsd: add file operations") > Cc: stable@vger.kernel.org > Cc: linux-cifs@vger.kernel.org > Cc: Namjae Jeon <namjae.jeon@samsung.com> > Cc: Steve French <stfrench@microsoft.com> > Cc: Ronnie Sahlberg <lsahlber@redhat.com> > Cc: Hyunchul Lee <hyc.lee@gmail.com> > Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Reviewed-by: Namjae Jeon <linkinjeon@kernel.org> Thanks!
diff --git a/fs/ksmbd/vfs.c b/fs/ksmbd/vfs.c index dcdd07c6efff..9cf2e2365832 100644 --- a/fs/ksmbd/vfs.c +++ b/fs/ksmbd/vfs.c @@ -1046,7 +1046,7 @@ int ksmbd_vfs_fqar_lseek(struct ksmbd_file *fp, loff_t start, loff_t length, *out_count = 0; end = start + length; while (start < end && *out_count < in_count) { - extent_start = f->f_op->llseek(f, start, SEEK_DATA); + extent_start = vfs_llseek(f, start, SEEK_DATA); if (extent_start < 0) { if (extent_start != -ENXIO) ret = (int)extent_start; @@ -1056,7 +1056,7 @@ int ksmbd_vfs_fqar_lseek(struct ksmbd_file *fp, loff_t start, loff_t length, if (extent_start >= end) break; - extent_end = f->f_op->llseek(f, extent_start, SEEK_HOLE); + extent_end = vfs_llseek(f, extent_start, SEEK_HOLE); if (extent_end < 0) { if (extent_end != -ENXIO) ret = (int)extent_end;
By not checking whether llseek is NULL, this might jump to NULL. Also, it doesn't check FMODE_LSEEK. Fix this by using vfs_llseek(), which always does the right thing. Fixes: f44158485826 ("cifsd: add file operations") Cc: stable@vger.kernel.org Cc: linux-cifs@vger.kernel.org Cc: Namjae Jeon <namjae.jeon@samsung.com> Cc: Steve French <stfrench@microsoft.com> Cc: Ronnie Sahlberg <lsahlber@redhat.com> Cc: Hyunchul Lee <hyc.lee@gmail.com> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> --- fs/ksmbd/vfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)