Skip to content

Commit

Permalink
netlink: do not proceed if dump's start() errs
Browse files Browse the repository at this point in the history
Drivers that use the start method for netlink dumping rely on dumpit not
being called if start fails. For example, ila_xlat.c allocates memory
and assigns it to cb->args[0] in its start() function. It might fail to
do that and return -ENOMEM instead. However, even when returning an
error, dumpit will be called, which, in the example above, quickly
dereferences the memory in cb->args[0], which will OOPS the kernel. This
is but one example of how this goes wrong.

Since start() has always been a function with an int return type, it
therefore makes sense to use it properly, rather than ignoring it. This
patch thus returns early and does not call dumpit() when start() fails.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jason A. Donenfeld authored and David S. Miller committed Sep 30, 2017
1 parent 3e7e072 commit fef0035
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions net/netlink/af_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -2270,10 +2270,13 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,

mutex_unlock(nlk->cb_mutex);

ret = 0;
if (cb->start)
cb->start(cb);
ret = cb->start(cb);

if (!ret)
ret = netlink_dump(sk);

ret = netlink_dump(sk);
sock_put(sk);

if (ret)
Expand Down

0 comments on commit fef0035

Please sign in to comment.