* [PATCH] cifs: don't dereference smb_file_target before null check
@ 2018-11-01 13:14 Colin King
2018-11-01 14:34 ` Steve French
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2018-11-01 13:14 UTC (permalink / raw)
To: Steve French, linux-cifs, samba-technical; +Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
There is a null check on dst_file->private data which suggests
it can be potentially null. However, before this check, pointer
smb_file_target is derived from dst_file->private and dereferenced
in the call to tlink_tcon, hence there is a potential null pointer
deference.
Fix this by assigning smb_file_target and target_tcon after the
null pointer sanity checks.
Detected by CoverityScan, CID#1475302 ("Dereference before null check")
Fixes: 04b38d601239 ("vfs: pull btrfs clone API to vfs layer")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
fs/cifs/cifsfs.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index e46af70153c0..db83938809a5 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -1003,8 +1003,8 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off,
struct inode *src_inode = file_inode(src_file);
struct inode *target_inode = file_inode(dst_file);
struct cifsFileInfo *smb_file_src = src_file->private_data;
- struct cifsFileInfo *smb_file_target = dst_file->private_data;
- struct cifs_tcon *target_tcon = tlink_tcon(smb_file_target->tlink);
+ struct cifsFileInfo *smb_file_target;
+ struct cifs_tcon *target_tcon;
unsigned int xid;
int rc;
@@ -1021,6 +1021,9 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off,
goto out;
}
+ smb_file_target = dst_file->private_data;
+ target_tcon = tlink_tcon(smb_file_target->tlink);
+
/*
* Note: cifs case is easier than btrfs since server responsible for
* checks for proper open modes and file type and if it wants
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] cifs: don't dereference smb_file_target before null check
2018-11-01 13:14 [PATCH] cifs: don't dereference smb_file_target before null check Colin King
@ 2018-11-01 14:34 ` Steve French
0 siblings, 0 replies; 2+ messages in thread
From: Steve French @ 2018-11-01 14:34 UTC (permalink / raw)
To: Colin King; +Cc: Steve French, CIFS, samba-technical, kernel-janitors, LKML
merged into cifs-2.6.git for-next
On Thu, Nov 1, 2018 at 8:14 AM Colin King <colin.king@canonical.com> wrote:
>
> From: Colin Ian King <colin.king@canonical.com>
>
> There is a null check on dst_file->private data which suggests
> it can be potentially null. However, before this check, pointer
> smb_file_target is derived from dst_file->private and dereferenced
> in the call to tlink_tcon, hence there is a potential null pointer
> deference.
>
> Fix this by assigning smb_file_target and target_tcon after the
> null pointer sanity checks.
>
> Detected by CoverityScan, CID#1475302 ("Dereference before null check")
>
> Fixes: 04b38d601239 ("vfs: pull btrfs clone API to vfs layer")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> fs/cifs/cifsfs.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> index e46af70153c0..db83938809a5 100644
> --- a/fs/cifs/cifsfs.c
> +++ b/fs/cifs/cifsfs.c
> @@ -1003,8 +1003,8 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off,
> struct inode *src_inode = file_inode(src_file);
> struct inode *target_inode = file_inode(dst_file);
> struct cifsFileInfo *smb_file_src = src_file->private_data;
> - struct cifsFileInfo *smb_file_target = dst_file->private_data;
> - struct cifs_tcon *target_tcon = tlink_tcon(smb_file_target->tlink);
> + struct cifsFileInfo *smb_file_target;
> + struct cifs_tcon *target_tcon;
> unsigned int xid;
> int rc;
>
> @@ -1021,6 +1021,9 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off,
> goto out;
> }
>
> + smb_file_target = dst_file->private_data;
> + target_tcon = tlink_tcon(smb_file_target->tlink);
> +
> /*
> * Note: cifs case is easier than btrfs since server responsible for
> * checks for proper open modes and file type and if it wants
> --
> 2.19.1
>
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-01 14:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-01 13:14 [PATCH] cifs: don't dereference smb_file_target before null check Colin King
2018-11-01 14:34 ` Steve French
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).