net/llc: avoid BUG_ON() in skb_orphan()

[ Upstream commit 8b74d439e1697110c5e5c600643e823eb1dd0762 ]

It seems nobody used LLC since linux-3.12.

Fortunately fuzzers like syzkaller still know how to run this code,
otherwise it would be no fun.

Setting skb->sk without skb->destructor leads to all kinds of
bugs, we now prefer to be very strict about it.

Ideally here we would use skb_set_owner() but this helper does not exist yet,
only CAN seems to have a private helper for that.

[js] take sock_efree from 62bccb8cdb6905

Fixes: 376c7311bdb6 ("net: add a temporary sanity check in skb_orphan()")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>

diff --git a/include/net/sock.h b/include/net/sock.h
index 238e934dd3c33a2ba20fa8075aca15f2788b193d..467d2f810fb35eeca8d87338351238ee04793d1f 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1554,6 +1554,7 @@ extern struct sk_buff             *sock_rmalloc(struct sock *sk,
 extern void                    sock_wfree(struct sk_buff *skb);
 extern void                    skb_orphan_partial(struct sk_buff *skb);
 extern void                    sock_rfree(struct sk_buff *skb);
+void sock_efree(struct sk_buff *skb);
 extern void                    sock_edemux(struct sk_buff *skb);
 
 extern int                     sock_setsockopt(struct socket *sock, int level,

diff --git a/net/core/sock.c b/net/core/sock.c
index 7fa427ed41bce0b4b5c85be196176fbe9570efe4..d765d6411a5b1cbd35ad1e0df37489dfd408db9a 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1656,6 +1656,12 @@ void sock_rfree(struct sk_buff *skb)
 }
 EXPORT_SYMBOL(sock_rfree);
 
+void sock_efree(struct sk_buff *skb)
+{
+       sock_put(skb->sk);
+}
+EXPORT_SYMBOL(sock_efree);
+
 void sock_edemux(struct sk_buff *skb)
 {
        struct sock *sk = skb->sk;

diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index cd8724177965cd00aa226bca602ab5c2f05a438f..6d36b3241b988bdef9da7b1975da0853b3941bbc 100644 (file)
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -821,7 +821,10 @@ void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb)
                 * another trick required to cope with how the PROCOM state
                 * machine works. -acme
                 */
+               skb_orphan(skb);
+               sock_hold(sk);
                skb->sk = sk;
+               skb->destructor = sock_efree;
        }
        if (!sock_owned_by_user(sk))
                llc_conn_rcv(sk, skb);

diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index e5850699098ef98787719dfd035fda0bfd4e3268..4ee1e1142e8ede02302f84d7d057bb8c87491c29 100644 (file)
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -290,7 +290,10 @@ static void llc_sap_rcv(struct llc_sap *sap, struct sk_buff *skb,
 
        ev->type   = LLC_SAP_EV_TYPE_PDU;
        ev->reason = 0;
+       skb_orphan(skb);
+       sock_hold(sk);
        skb->sk = sk;
+       skb->destructor = sock_efree;
        llc_sap_state_process(sap, skb);
 }