leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

9p: fix multiple NULL-pointer-dereferences

Browse Source 
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>
This commit is contained in:
Tomas Bortoli 2018-07-27 13:05:58 +02:00 committed by Dominique Martinet
parent 3111784bee
commit 10aa14527f
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/9p/trans_fd.c
View File

@ -945,7 +945,7 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)
if (err < 0) if (err < 0)
return err; return err;
if (valid_ipaddr4(addr) < 0) if (addr == NULL || valid_ipaddr4(addr) < 0)
return -EINVAL; return -EINVAL;
csocket = NULL; csocket = NULL;
@ -995,6 +995,9 @@ p9_fd_create_unix(struct p9_client *client, const char *addr, char *args)
csocket = NULL; csocket = NULL;
if (addr == NULL)
return -EINVAL;
if (strlen(addr) >= UNIX_PATH_MAX) { if (strlen(addr) >= UNIX_PATH_MAX) {
pr_err("%s (%d): address too long: %s\n", pr_err("%s (%d): address too long: %s\n",
__func__, task_pid_nr(current), addr); __func__, task_pid_nr(current), addr);

3
net/9p/trans_rdma.c
View File

@ -645,6 +645,9 @@ rdma_create_trans(struct p9_client *client, const char *addr, char *args)
struct rdma_conn_param conn_param; struct rdma_conn_param conn_param;
struct ib_qp_init_attr qp_attr; struct ib_qp_init_attr qp_attr;
if (addr == NULL)
return -EINVAL;
/* Parse the transport specific mount options */ /* Parse the transport specific mount options */
err = parse_opts(args, &opts); err = parse_opts(args, &opts);
if (err < 0) if (err < 0)

3
net/9p/trans_virtio.c
View File

@ -654,6 +654,9 @@ p9_virtio_create(struct p9_client *client, const char *devname, char *args)
int ret = -ENOENT; int ret = -ENOENT;
int found = 0; int found = 0;
if (devname == NULL)
return -EINVAL;
mutex_lock(&virtio_9p_lock); mutex_lock(&virtio_9p_lock);
list_for_each_entry(chan, &virtio_chan_list, chan_list) { list_for_each_entry(chan, &virtio_chan_list, chan_list) {
if (!strncmp(devname, chan->tag, chan->tag_len) && if (!strncmp(devname, chan->tag, chan->tag_len) &&

3
net/9p/trans_xen.c
View File

@ -94,6 +94,9 @@ static int p9_xen_create(struct p9_client *client, const char *addr, char *args)
{ {
struct xen_9pfs_front_priv *priv; struct xen_9pfs_front_priv *priv;
if (addr == NULL)
return -EINVAL;
read_lock(&xen_9pfs_lock); read_lock(&xen_9pfs_lock);
list_for_each_entry(priv, &xen_9pfs_devs, list) { list_for_each_entry(priv, &xen_9pfs_devs, list) {
if (!strcmp(priv->tag, addr)) { if (!strcmp(priv->tag, addr)) {