From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Colin Ian King <colin.king@canonical.com>,
Steve French <stfrench@microsoft.com>,
Sasha Levin <sashal@kernel.org>,
linux-cifs@vger.kernel.org
Subject: [PATCH AUTOSEL 4.9 02/17] cifs: don't dereference smb_file_target before null check
Date: Tue, 13 Nov 2018 00:52:08 -0500 [thread overview]
Message-ID: <20181113055223.79060-2-sashal@kernel.org> (raw)
In-Reply-To: <20181113055223.79060-1-sashal@kernel.org>
From: Colin Ian King <colin.king@canonical.com>
[ Upstream commit 8c6c9bed8773375b1d54ccca2911ec892c59db5d ]
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>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 87658f63b374..be84d49f2406 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -927,8 +927,8 @@ static int cifs_clone_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;
@@ -942,6 +942,9 @@ static int cifs_clone_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.17.1
next prev parent reply other threads:[~2018-11-13 5:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-13 5:52 [PATCH AUTOSEL 4.9 01/17] bfs: add sanity check at bfs_fill_super() Sasha Levin
2018-11-13 5:52 ` Sasha Levin [this message]
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 03/17] mm/memory_hotplug: make add_memory() take the device_hotplug_lock Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 04/17] reiserfs: propagate errors from fill_with_dentries() properly Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 05/17] hfs: prevent btree data loss on root split Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 06/17] hfsplus: " Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 07/17] um: Give start_idle_thread() a return code Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 08/17] drm/edid: Add 6 bpc quirk for BOE panel Sasha Levin
2018-11-21 9:31 ` Daniel Vetter
2018-11-21 9:33 ` Daniel Vetter
2018-11-22 15:53 ` Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 09/17] platform/x86: intel_telemetry: report debugfs failure Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 10/17] clk: fixed-rate: fix of_node_get-put imbalance Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 11/17] fs/exofs: fix potential memory leak in mount option parsing Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 12/17] clk: samsung: exynos5420: Enable PERIS clocks for suspend Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 13/17] platform/x86: acerhdf: Add BIOS entry for Gateway LT31 v1.3307 Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 14/17] arm64: percpu: Initialize ret in the default case Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 15/17] mm/vmstat.c: assert that vmstat_text is in sync with stat_items_size Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 16/17] userfaultfd: allow get_mempolicy(MPOL_F_NODE|MPOL_F_ADDR) to trigger userfaults Sasha Levin
2018-11-13 5:52 ` [PATCH AUTOSEL 4.9 17/17] mm: don't warn about large allocations for slab Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181113055223.79060-2-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=colin.king@canonical.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=stfrench@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome