9p: fix multiple NULL-pointer-dereferences

commit 10aa14527f458e9867cf3d2cc6b8cb0f6704448b upstream.

Added checks to prevent GPFs from raising.

Link: http://lkml.kernel.org/r/20180727110558.5479-1-tomasbortoli@gmail.com
Signed-off-by: Tomas Bortoli <tomasbortoli@gmail.com>
Reported-by: syzbot+1a262da37d3bead15c39@syzkaller.appspotmail.com
Cc: stable@vger.kernel.org
Signed-off-by: Dominique Martinet <dominique.martinet@cea.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index f8dafa8fa70b39f1bcf3801089d0b754c4e6f6e6..2b543532e2f1748c9a8e2869e5a1e7a5ab34848b 100644 (file)
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -939,7 +939,7 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)
        if (err < 0)
                return err;
 
-       if (valid_ipaddr4(addr) < 0)
+       if (addr == NULL || valid_ipaddr4(addr) < 0)
                return -EINVAL;
 
        csocket = NULL;
@@ -987,6 +987,9 @@ p9_fd_create_unix(struct p9_client *client, const char *addr, char *args)
 
        csocket = NULL;
 
+       if (addr == NULL)
+               return -EINVAL;
+
        if (strlen(addr) >= UNIX_PATH_MAX) {
                pr_err("%s (%d): address too long: %s\n",
                       __func__, task_pid_nr(current), addr);

diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
index 553ed4ecb6a0ec6527ca6171e3493f97ac8a8e0d..5a2ad4707463a21afe066ec0cdfd6df58f56bd40 100644 (file)
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -622,6 +622,9 @@ rdma_create_trans(struct p9_client *client, const char *addr, char *args)
        struct rdma_conn_param conn_param;
        struct ib_qp_init_attr qp_attr;
 
+       if (addr == NULL)
+               return -EINVAL;
+
        /* Parse the transport specific mount options */
        err = parse_opts(args, &opts);
        if (err < 0)

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 73c700a55f0232242c8a041a87bd5e65a3c52107..da0d3b2574593c457546bb28f56f04eb4f013993 100644 (file)
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -651,6 +651,9 @@ p9_virtio_create(struct p9_client *client, const char *devname, char *args)
        int ret = -ENOENT;
        int found = 0;
 
+       if (devname == NULL)
+               return -EINVAL;
+
        mutex_lock(&virtio_9p_lock);
        list_for_each_entry(chan, &virtio_chan_list, chan_list) {
                if (!strncmp(devname, chan->tag, chan->tag_len) &&