]> asedeno.scripts.mit.edu Git - linux.git/commit
ipv6: fix cleanup ordering for pingv6 registration
authorSabrina Dubroca <sd@queasysnail.net>
Tue, 28 Aug 2018 11:40:52 +0000 (13:40 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Aug 2018 02:28:55 +0000 (19:28 -0700)
commita03dc36bdca6b614651fedfcd8559cf914d2d21d
tree410ce268f8afce36c0bb58573f76d925bb7fb58d
parentafe49de44c27a89e8e9631c44b5ffadf6ace65e2
ipv6: fix cleanup ordering for pingv6 registration

Commit 6d0bfe226116 ("net: ipv6: Add IPv6 support to the ping socket.")
contains an error in the cleanup path of inet6_init(): when
proto_register(&pingv6_prot, 1) fails, we try to unregister
&pingv6_prot. When rawv6_init() fails, we skip unregistering
&pingv6_prot.

Example of panic (triggered by faking a failure of
 proto_register(&pingv6_prot, 1)):

    general protection fault: 0000 [#1] PREEMPT SMP KASAN PTI
    [...]
    RIP: 0010:__list_del_entry_valid+0x79/0x160
    [...]
    Call Trace:
     proto_unregister+0xbb/0x550
     ? trace_preempt_on+0x6f0/0x6f0
     ? sock_no_shutdown+0x10/0x10
     inet6_init+0x153/0x1b8

Fixes: 6d0bfe226116 ("net: ipv6: Add IPv6 support to the ping socket.")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/af_inet6.c