netlink: use NETLINK_CB(in_skb).sk instead of looking it up

When netlink_ack() reports an allocation error to the sending
socket, there's no need to look up the sending socket since
it's available in the SKB's CB. Use that instead of going to
the trouble of looking it up.

Note that the pointer is only available since Eric Biederman's
commit 3fbc290540a1 ("netlink: Make the sending netlink socket availabe in NETLINK_CB")
which is far newer than the original lookup code (Oct 2003)
(though the field was called 'ssk' in that commit and only got
renamed to 'sk' later, I'd actually argue 'ssk' was better - or
perhaps it should've been 'source_sk' - since there are so many
different 'sk's involved.)

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index f34750691c5c0e24aef976f59041d44e8342d2a0..336d9c6dcad9354b2717992894cc51289da6a62b 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2336,16 +2336,8 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,
 
        skb = nlmsg_new(payload + tlvlen, GFP_KERNEL);
        if (!skb) {
-               struct sock *sk;
-
-               sk = netlink_lookup(sock_net(in_skb->sk),
-                                   in_skb->sk->sk_protocol,
-                                   NETLINK_CB(in_skb).portid);
-               if (sk) {
-                       sk->sk_err = ENOBUFS;
-                       sk->sk_error_report(sk);
-                       sock_put(sk);
-               }
+               NETLINK_CB(in_skb).sk->sk_err = ENOBUFS;
+               NETLINK_CB(in_skb).sk->sk_error_report(NETLINK_CB(in_skb).sk);
                return;
        }