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 588bf88c3305d3e73bed1584d4aa23f234c4e26c..9ec52f7930e1710bb402b3df585d9c429c3ca039 100644 (file)
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -940,7 +940,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;
@@ -990,6 +990,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 3d414acb7015d8fc73f20bec381e6200ce3d3d53..afaf0d65f3dd67dfab1ad38c6483a1f5da281e2e 100644 (file)
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -644,6 +644,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 65761381c58fe89db46cf91e93bea71ee0cc4f2c..fe9716bd1da06e5c08d627d70db76c24e3de535f 100644 (file)
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -650,6 +650,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) &&

diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c
index 2e2b8bca54f33352b7e398543bc2a2fbf8c74826..c2d54ac76bfdbb72fa7ad24d63f7379afdc5433d 100644 (file)
--- a/net/9p/trans_xen.c
+++ b/net/9p/trans_xen.c
@@ -94,6 +94,9 @@ static int p9_xen_create(struct p9_client *client, const char *addr, char *args)
 {
        struct xen_9pfs_front_priv *priv;
 
+       if (addr == NULL)
+               return -EINVAL;
+
        read_lock(&xen_9pfs_lock);
        list_for_each_entry(priv, &xen_9pfs_devs, list) {
                if (!strcmp(priv->tag, addr)) {