Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1741081

[PATCH v2] netlink: do not proceed if dump's start() errs

Show all headers | View raw

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>
---
 net/netlink/af_netlink.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 327807731b44..94c11cf0459d 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -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)
-- 
2.14.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] netlink: do not proceed if dump's start() errs "Jason A. Donenfeld" <Jason@zx2c4.com> - 2017-09-27 14:50 +0200
  Re: [PATCH] netlink: do not proceed if dump's start() errs "Jason A. Donenfeld" <Jason@zx2c4.com> - 2017-09-27 15:00 +0200
    Re: [PATCH] netlink: do not proceed if dump's start() errs "Jason A. Donenfeld" <Jason@zx2c4.com> - 2017-09-27 15:10 +0200
      [PATCH v2] netlink: do not proceed if dump's start() errs "Jason A. Donenfeld" <Jason@zx2c4.com> - 2017-09-28 00:50 +0200
        Re: [PATCH v2] netlink: do not proceed if dump's start() errs "Jason A. Donenfeld" <Jason@zx2c4.com> - 2017-09-28 12:50 +0200
        Re: [PATCH v2] netlink: do not proceed if dump's start() errs David Miller <davem@davemloft.net> - 2017-09-30 08:30 +0200
        Re: [PATCH v2] netlink: do not proceed if dump's start() errs Johannes Berg <johannes@sipsolutions.net> - 2017-09-30 09:40 +0200
          Re: [PATCH v2] netlink: do not proceed if dump's start() errs David Miller <davem@davemloft.net> - 2017-09-30 17:20 +0200
    Re: [PATCH] netlink: do not proceed if dump's start() errs Johannes Berg <johannes@sipsolutions.net> - 2017-09-27 15:10 +0200

csiph-web