diff mbox series

[4.4,12/48] cifs: Fix null pointer check in cifs_read

Message ID	20200601173955.878992498@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=Ycwd=7O=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Coverity <scan-admin@coverity.com>, Steve French <stfrench@microsoft.com>, Shyam Prasad N <nspmangalore@gmail.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.4 12/48] cifs: Fix null pointer check in cifs_read Date: Mon, 1 Jun 2020 19:53:22 +0200 Message-Id: <20200601173955.878992498@linuxfoundation.org> In-Reply-To: <20200601173952.175939894@linuxfoundation.org> References: <20200601173952.175939894@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.4,02/48] net: revert "net: get rid of an signed integer overflow in ip_idents_reserve()" [4.4,04/48] net/mlx5: Add command entry handling completion [4.4,06/48] net/mlx4_core: fix a memory leak bug. [4.4,07/48] uapi: fix linux/if_pppol2tp.h userspace compilation errors [4.4,12/48] cifs: Fix null pointer check in cifs_read [4.4,14/48] Input: i8042 - add ThinkPad S230u to i8042 nomux list [4.4,15/48] Input: evdev - call input_flush_device() on release(), not flush() [4.4,18/48] IB/qib: Call kobject_put() when kobject_init_and_add() fails [4.4,21/48] exec: Always set cap_ambient in cap_bprm_set_creds [4.4,23/48] include/asm-generic/topology.h: guard cpumask_of_node() macro argument [4.4,25/48] parisc: Fix kernel panic in mem_init() [4.4,27/48] xfrm: allow to accept packets with ipv6 NEXTHDR_HOP in xfrm_input [4.4,29/48] xfrm: fix a NULL-ptr deref in xfrm_local_error [4.4,30/48] vti4: eliminated some duplicate code. [4.4,31/48] ip_vti: receive ipip packet by calling ip_tunnel_rcv [4.4,32/48] netfilter: nft_reject_bridge: enable reject with bridge vlan [4.4,34/48] netfilter: nf_conntrack_pptp: prevent buffer overflows in debug code [4.4,37/48] Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list" [4.4,38/48] netfilter: nf_conntrack_pptp: fix compilation warning with W=1 build [4.4,42/48] usb: renesas_usbhs: gadget: fix spin_lock_init() for &uep->lock [4.4,43/48] mac80211: fix memory leak [4.4,45/48] mm/vmalloc.c: dont dereference possible NULL pointer in __vunmap() [4.4,48/48] drm/msm: Fix possible null dereference on failure of get_pages()

Commit Message

Greg KH June 1, 2020, 5:53 p.m. UTC

From: Steve French <stfrench@microsoft.com>

[ Upstream commit 9bd21d4b1a767c3abebec203342f3820dcb84662 ]

Coverity scan noted a redundant null check

Coverity-id: 728517
Reported-by: Coverity <scan-admin@coverity.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Shyam Prasad N <nspmangalore@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/cifs/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 2ffdaedca7e9..b5a05092f862 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -3230,7 +3230,7 @@  cifs_read(struct file *file, char *read_data, size_t read_size, loff_t *offset)
 			 * than it negotiated since it will refuse the read
 			 * then.
 			 */
-			if ((tcon->ses) && !(tcon->ses->capabilities &
+			if (!(tcon->ses->capabilities &
 				tcon->ses->server->vals->cap_large_files)) {
 				current_read_size = min_t(uint,
 					current_read_size, CIFSMaxBufSize);