]> git.baikalelectronics.ru Git - kernel.git/commitdiff
smb3: add additional null check in SMB2_ioctl
authorSteve French <stfrench@microsoft.com>
Thu, 11 Nov 2021 20:39:23 +0000 (14:39 -0600)
committerSteve French <stfrench@microsoft.com>
Thu, 11 Nov 2021 20:49:24 +0000 (14:49 -0600)
Although unlikely for it to be possible for rsp to be null here,
the check is safer to add, and quiets a Coverity warning.

Addresses-Coverity: 1443909 ("Explicit Null dereference")
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/cifs/smb2pdu.c

index b20398a8097d70c50eca2e6f694b8f90fbd2aa22..4dda26059aacdf37f1a81249735b4792a4dd368a 100644 (file)
@@ -3162,6 +3162,16 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
        if ((plen == NULL) || (out_data == NULL))
                goto ioctl_exit;
 
+       /*
+        * Although unlikely to be possible for rsp to be null and rc not set,
+        * adding check below is slightly safer long term (and quiets Coverity
+        * warning)
+        */
+       if (rsp == NULL) {
+               rc = -EIO;
+               goto ioctl_exit;
+       }
+
        *plen = le32_to_cpu(rsp->OutputCount);
 
        /* We check for obvious errors in the output buffer length and offset */