From: Ronnie Sahlberg <lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: linux-cifs <linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH 06/12] cifs: initialize rsp_iov in SMB2_read and add check for NULL
Date: Wed, 11 Oct 2017 12:59:21 +1100 [thread overview]
Message-ID: <20171011015927.7669-7-lsahlber@redhat.com> (raw)
In-Reply-To: <20171011015927.7669-1-lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Ronnie Sahlberg <lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
fs/cifs/smb2pdu.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index ca861ee4ac0a..96a6ed9c86d4 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -2641,10 +2641,10 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,
{
int resp_buftype, rc = -EACCES;
struct smb2_read_plain_req *req = NULL;
- struct smb2_read_rsp *rsp = NULL;
+ struct smb2_read_rsp *rsp;
struct smb2_sync_hdr *shdr;
struct kvec iov[2];
- struct kvec rsp_iov;
+ struct kvec rsp_iov = { NULL, 0 };
unsigned int total_len;
__be32 req_len;
struct smb_rqst rqst = { .rq_iov = iov,
@@ -2671,6 +2671,10 @@ SMB2_read(const unsigned int xid, struct cifs_io_parms *io_parms,
cifs_small_buf_release(req);
rsp = (struct smb2_read_rsp *)rsp_iov.iov_base;
+ if (rsp == NULL) {
+ cifs_dbg(VFS, "rsp is NULL in read\n");
+ return -EIO;
+ }
shdr = get_sync_hdr(rsp);
if (shdr->Status == STATUS_END_OF_FILE) {
--
2.13.3
next prev parent reply other threads:[~2017-10-11 1:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 1:59 [PATCH 00/12] cifs: various fixes for NULL pointers Ronnie Sahlberg
[not found] ` <20171011015927.7669-1-lsahlber-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-10-11 1:59 ` [PATCH 01/12] cifs: initialize rsp_iov in SMB2_negotiate Ronnie Sahlberg
2017-10-11 1:59 ` [PATCH 02/12] cifs: initialize rsp_iov in SMB2_ioctl and check for NULL before deref Ronnie Sahlberg
2017-10-11 1:59 ` [PATCH 03/12] cifs: initialize rsp_iov in SMB2_close Ronnie Sahlberg
2017-10-11 1:59 ` [PATCH 04/12] cifs: initialize rsp_iov in SMB2_query_info Ronnie Sahlberg
2017-10-11 1:59 ` [PATCH 05/12] cifs: initialize rsp_iov in SMB2_flush Ronnie Sahlberg
2017-10-11 1:59 ` Ronnie Sahlberg [this message]
2017-10-11 1:59 ` [PATCH 07/12] cifs: initialize rsp_iov in SMB2_write Ronnie Sahlberg
2017-10-11 1:59 ` [PATCH 08/12] cifs: initialize rsp_iov in SMB2_query_directory Ronnie Sahlberg
2017-10-11 1:59 ` [PATCH 09/12] cifs: initialize rsp_iov in send_set_info Ronnie Sahlberg
2017-10-11 1:59 ` [PATCH 10/12] cifs: initialize rsp_iov in SMB2_QFS_info Ronnie Sahlberg
2017-10-11 1:59 ` [PATCH 11/12] cifs: initialize rsp_iov in SMB2_QFS_attr Ronnie Sahlberg
2017-10-11 1:59 ` [PATCH 12/12] cifs: initialize rsp_iov in smb2_lockv and fix a memory leak Ronnie Sahlberg
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=20171011015927.7669-7-lsahlber@redhat.com \
--to=lsahlber-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
--cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
/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