UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipc/mqueue: improve exception handling in do_mq_notify() 

Null pointers were assigned to local variables in a few cases as exception
handling.  The jump target “out” was used where no meaningful data
processing actions should eventually be performed by branches of an if
statement then.  Use an additional jump target for calling dev_kfree_skb()
directly.

Return also directly after error conditions were detected when no extra
clean-up is needed by this function implementation.

Link: http://lkml.kernel.org/r/592ef10e-0b69-72d0-9789-fc48f638fdfd@web.de
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Markus Elfring 2019-09-25 16:48:17 -07:00 committed by Linus Torvalds
parent 97b0b1ad58
commit c231740dd9
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ipc/mqueue.c
View File

@ -1240,15 +1240,14 @@ static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification)
/* create the notify skb */ /* create the notify skb */
nc = alloc_skb(NOTIFY_COOKIE_LEN, GFP_KERNEL); nc = alloc_skb(NOTIFY_COOKIE_LEN, GFP_KERNEL);
if (!nc) { if (!nc)
ret = -ENOMEM; return -ENOMEM;
goto out;
}
if (copy_from_user(nc->data, if (copy_from_user(nc->data,
notification->sigev_value.sival_ptr, notification->sigev_value.sival_ptr,
NOTIFY_COOKIE_LEN)) { NOTIFY_COOKIE_LEN)) {
ret = -EFAULT; ret = -EFAULT;
goto out; goto free_skb;
} }
/* TODO: add a header? */ /* TODO: add a header? */
@ -1264,8 +1263,7 @@ retry:
fdput(f); fdput(f);
if (IS_ERR(sock)) { if (IS_ERR(sock)) {
ret = PTR_ERR(sock); ret = PTR_ERR(sock);
sock = NULL; goto free_skb;
goto out;
} }
timeo = MAX_SCHEDULE_TIMEOUT; timeo = MAX_SCHEDULE_TIMEOUT;
@ -1274,11 +1272,8 @@ retry:
sock = NULL; sock = NULL;
goto retry; goto retry;
} }
if (ret) { if (ret)
sock = NULL; return ret;
nc = NULL;
goto out;
}
} }
} }
@ -1334,6 +1329,7 @@ out:
if (sock) if (sock)
netlink_detachskb(sock, nc); netlink_detachskb(sock, nc);
else else
free_skb:
dev_kfree_skb(nc); dev_kfree_skb(nc);
return ret; return ret;