| Message ID | 27f20cc781cac28bc2ce7229719748a2f6824bd8.1441827818.git.marcelo.leitner@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 09/09/2015 04:03 PM, Marcelo Ricardo Leitner wrote: > Consider sctp module is unloaded and is being requested because an user > is creating a sctp socket. > > During initialization, sctp will add the new protocol type and then > initialize pernet subsys: > > status = sctp_v4_protosw_init(); > if (status) > goto err_protosw_init; > > status = sctp_v6_protosw_init(); > if (status) > goto err_v6_protosw_init; > > status = register_pernet_subsys(&sctp_net_ops); > > The problem is that after those calls to sctp_v{4,6}_protosw_init(), it > is possible for userspace to create SCTP sockets like if the module is > already fully loaded. If that happens, one of the possible effects is > that we will have readers for net->sctp.local_addr_list list earlier > than expected and sctp_net_init() does not take precautions while > dealing with that list, leading to a potential panic but not limited to > that, as sctp_sock_init() will copy a bunch of blank/partially > initialized values from net->sctp. > > The race happens like this: > > CPU 0 | CPU 1 > socket() | > __sock_create | socket() > inet_create | __sock_create > list_for_each_entry_rcu( | > answer, &inetsw[sock->type], | > list) { | inet_create > /* no hits */ | > if (unlikely(err)) { | > ... | > request_module() | > /* socket creation is blocked | > * the module is fully loaded | > */ | > sctp_init | > sctp_v4_protosw_init | > inet_register_protosw | > list_add_rcu(&p->list, | > last_perm); | > | list_for_each_entry_rcu( > | answer, &inetsw[sock->type], > sctp_v6_protosw_init | list) { > | /* hit, so assumes protocol > | * is already loaded > | */ > | /* socket creation continues > | * before netns is initialized > | */ > register_pernet_subsys | > > Inverting the initialization order between register_pernet_subsys() and > sctp_v4_protosw_init() is not possible because register_pernet_subsys() > will create a control sctp socket, so the protocol must be already > visible by then. Deferring the socket creation to a work-queue is not > good specially because we loose the ability to handle its errors. > > So the fix then is to invert the initialization order inside > register_pernet_subsys() so that the control socket is created by last > and also block socket creation if netns initialization wasn't yet > performed. > not sure how much I like that... Wouldn't it be better to pull the control socket initialization stuff out into its own function that does something like for_each_net_rcu() init_control_socket(net, ...) Or may be even pull the control socket creation stuff completely into its own per-net ops operations structure and initialize it after the the protosw stuff has been done. -vlad > Fixes: 4db67e808640 ("sctp: Make the address lists per network namespace") > Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > --- > net/sctp/protocol.c | 18 +++++++++++------- > net/sctp/socket.c | 4 ++++ > 2 files changed, 15 insertions(+), 7 deletions(-) > > diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c > index 4345790ad3266c353eeac5398593c2a9ce4effda..d8f78165768a75f93f4ce4120dd5475b6a623aaf 100644 > --- a/net/sctp/protocol.c > +++ b/net/sctp/protocol.c > @@ -1271,12 +1271,6 @@ static int __net_init sctp_net_init(struct net *net) > > sctp_dbg_objcnt_init(net); > > - /* Initialize the control inode/socket for handling OOTB packets. */ > - if ((status = sctp_ctl_sock_init(net))) { > - pr_err("Failed to initialize the SCTP control sock\n"); > - goto err_ctl_sock_init; > - } > - > /* Initialize the local address list. */ > INIT_LIST_HEAD(&net->sctp.local_addr_list); > spin_lock_init(&net->sctp.local_addr_lock); > @@ -1284,11 +1278,21 @@ static int __net_init sctp_net_init(struct net *net) > > /* Initialize the address event list */ > INIT_LIST_HEAD(&net->sctp.addr_waitq); > - INIT_LIST_HEAD(&net->sctp.auto_asconf_splist); > spin_lock_init(&net->sctp.addr_wq_lock); > net->sctp.addr_wq_timer.expires = 0; > setup_timer(&net->sctp.addr_wq_timer, sctp_addr_wq_timeout_handler, > (unsigned long)net); > + /* sctp_init_sock() will use this to know that netns is > + * nearly all initialized but already good to go. > + */ > + INIT_LIST_HEAD(&net->sctp.auto_asconf_splist); > + > + /* Initialize the control inode/socket for handling OOTB packets. */ > + status = sctp_ctl_sock_init(net); > + if (status) { > + pr_err("Failed to initialize the SCTP control sock\n"); > + goto err_ctl_sock_init; > + } > > return 0; > > diff --git a/net/sctp/socket.c b/net/sctp/socket.c > index 17bef01b9aa3e7f75328d39fc976f9e80d641e92..45b94deec93d0c7c1612a16922348cf2a7e65ec5 100644 > --- a/net/sctp/socket.c > +++ b/net/sctp/socket.c > @@ -3993,6 +3993,10 @@ static int sctp_init_sock(struct sock *sk) > > pr_debug("%s: sk:%p\n", __func__, sk); > > + /* Validate if netns is already initialized. */ > + if (!net->sctp.auto_asconf_splist.prev) > + return -ENOPROTOOPT; > + > sp = sctp_sk(sk); > > /* Initialize the SCTP per socket area. */ > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em 09-09-2015 17:30, Vlad Yasevich escreveu: > On 09/09/2015 04:03 PM, Marcelo Ricardo Leitner wrote: >> Consider sctp module is unloaded and is being requested because an user >> is creating a sctp socket. >> >> During initialization, sctp will add the new protocol type and then >> initialize pernet subsys: >> >> status = sctp_v4_protosw_init(); >> if (status) >> goto err_protosw_init; >> >> status = sctp_v6_protosw_init(); >> if (status) >> goto err_v6_protosw_init; >> >> status = register_pernet_subsys(&sctp_net_ops); >> >> The problem is that after those calls to sctp_v{4,6}_protosw_init(), it >> is possible for userspace to create SCTP sockets like if the module is >> already fully loaded. If that happens, one of the possible effects is >> that we will have readers for net->sctp.local_addr_list list earlier >> than expected and sctp_net_init() does not take precautions while >> dealing with that list, leading to a potential panic but not limited to >> that, as sctp_sock_init() will copy a bunch of blank/partially >> initialized values from net->sctp. >> >> The race happens like this: >> >> CPU 0 | CPU 1 >> socket() | >> __sock_create | socket() >> inet_create | __sock_create >> list_for_each_entry_rcu( | >> answer, &inetsw[sock->type], | >> list) { | inet_create >> /* no hits */ | >> if (unlikely(err)) { | >> ... | >> request_module() | >> /* socket creation is blocked | >> * the module is fully loaded | >> */ | >> sctp_init | >> sctp_v4_protosw_init | >> inet_register_protosw | >> list_add_rcu(&p->list, | >> last_perm); | >> | list_for_each_entry_rcu( >> | answer, &inetsw[sock->type], >> sctp_v6_protosw_init | list) { >> | /* hit, so assumes protocol >> | * is already loaded >> | */ >> | /* socket creation continues >> | * before netns is initialized >> | */ >> register_pernet_subsys | >> >> Inverting the initialization order between register_pernet_subsys() and >> sctp_v4_protosw_init() is not possible because register_pernet_subsys() >> will create a control sctp socket, so the protocol must be already >> visible by then. Deferring the socket creation to a work-queue is not >> good specially because we loose the ability to handle its errors. >> >> So the fix then is to invert the initialization order inside >> register_pernet_subsys() so that the control socket is created by last >> and also block socket creation if netns initialization wasn't yet >> performed. >> > > not sure how much I like that... Wouldn't it be better > to pull the control socket initialization stuff out into its > own function that does something like > > for_each_net_rcu() > init_control_socket(net, ...) > > > Or may be even pull the control socket creation > stuff completely into its own per-net ops operations structure > and initialize it after the the protosw stuff has been done. > > -vlad I'm afraid error handling won't be easy then. But still, the control socket is not really the problem, because we don't care (much?) if it contains zeroed values and the panic happens only if you call connect() on it. I moved it solely because of the protection on sctp_init_sock(). The real problem is new sockets created by an user application while module is still loading, because even if them don't trigger the panic, they may not be fully functional due to improper values loaded. Can't see other good ways to protect sctp_init_sock() from that early call (as in, prior to netns initialization). I used the list pointer because that's null as that memory is entirely zeroed when alloced and, after initialization, it's never null again. Works like a lock/condition without using an extra field. Marcelo >> Fixes: 4db67e808640 ("sctp: Make the address lists per network namespace") >> Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> >> --- >> net/sctp/protocol.c | 18 +++++++++++------- >> net/sctp/socket.c | 4 ++++ >> 2 files changed, 15 insertions(+), 7 deletions(-) >> >> diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c >> index 4345790ad3266c353eeac5398593c2a9ce4effda..d8f78165768a75f93f4ce4120dd5475b6a623aaf 100644 >> --- a/net/sctp/protocol.c >> +++ b/net/sctp/protocol.c >> @@ -1271,12 +1271,6 @@ static int __net_init sctp_net_init(struct net *net) >> >> sctp_dbg_objcnt_init(net); >> >> - /* Initialize the control inode/socket for handling OOTB packets. */ >> - if ((status = sctp_ctl_sock_init(net))) { >> - pr_err("Failed to initialize the SCTP control sock\n"); >> - goto err_ctl_sock_init; >> - } >> - >> /* Initialize the local address list. */ >> INIT_LIST_HEAD(&net->sctp.local_addr_list); >> spin_lock_init(&net->sctp.local_addr_lock); >> @@ -1284,11 +1278,21 @@ static int __net_init sctp_net_init(struct net *net) >> >> /* Initialize the address event list */ >> INIT_LIST_HEAD(&net->sctp.addr_waitq); >> - INIT_LIST_HEAD(&net->sctp.auto_asconf_splist); >> spin_lock_init(&net->sctp.addr_wq_lock); >> net->sctp.addr_wq_timer.expires = 0; >> setup_timer(&net->sctp.addr_wq_timer, sctp_addr_wq_timeout_handler, >> (unsigned long)net); >> + /* sctp_init_sock() will use this to know that netns is >> + * nearly all initialized but already good to go. >> + */ >> + INIT_LIST_HEAD(&net->sctp.auto_asconf_splist); >> + >> + /* Initialize the control inode/socket for handling OOTB packets. */ >> + status = sctp_ctl_sock_init(net); >> + if (status) { >> + pr_err("Failed to initialize the SCTP control sock\n"); >> + goto err_ctl_sock_init; >> + } >> >> return 0; >> >> diff --git a/net/sctp/socket.c b/net/sctp/socket.c >> index 17bef01b9aa3e7f75328d39fc976f9e80d641e92..45b94deec93d0c7c1612a16922348cf2a7e65ec5 100644 >> --- a/net/sctp/socket.c >> +++ b/net/sctp/socket.c >> @@ -3993,6 +3993,10 @@ static int sctp_init_sock(struct sock *sk) >> >> pr_debug("%s: sk:%p\n", __func__, sk); >> >> + /* Validate if netns is already initialized. */ >> + if (!net->sctp.auto_asconf_splist.prev) >> + return -ENOPROTOOPT; >> + >> sp = sctp_sk(sk); >> >> /* Initialize the SCTP per socket area. */ >> > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Date: Wed, 9 Sep 2015 17:03:01 -0300 > So the fix then is to invert the initialization order inside > register_pernet_subsys() so that the control socket is created by last > and also block socket creation if netns initialization wasn't yet > performed. If we really need to we could make ->create() fail with -EAFNOSUPPORT if kern==1 until the protocol is fully setup. Or, instead of failing, we could make such ->create() calls block until the control sock init is complete or fails. We have actually several visibility issues wrt. control sockets on protocol init, in general. For example, such control sockets can briefly be hashed and visible to socket dumps and packet input. A lot of really tricky issues involved here. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em 09-09-2015 21:16, David Miller escreveu: > From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > Date: Wed, 9 Sep 2015 17:03:01 -0300 > >> So the fix then is to invert the initialization order inside >> register_pernet_subsys() so that the control socket is created by last >> and also block socket creation if netns initialization wasn't yet >> performed. > > If we really need to we could make ->create() fail with -EAFNOSUPPORT > if kern==1 until the protocol is fully setup. > > Or, instead of failing, we could make such ->create() calls block > until the control sock init is complete or fails. I guess I should have written that paragraph in another order, perhaps like: So the fix then is to deny any sctp socket creation until netns initialization is sufficiently done. And due to that, we have to initialize the control socket as last step in netns initialization, as now it can't be created earlier anymore. Is it clearer on the intention? And my emphasis on userspace sockets was to highlight that a random user could trigger it, but yes both users are affected by the issue. Strictly speaking, we would have to block ->create() not until the control socket init is done but until the protocol is fully loaded. Such condition, with this patch, is after net->sctp.auto_asconf_splist is initialized. But for blocking until instead of just denying, we would need some other mechanism. It would be better from the (sctp) user point of view but then such solution may better belong to another layer instead and protect all protocols at once. (I checked and couldn't find other protocols at risk like sctp) > We have actually several visibility issues wrt. control sockets on > protocol init, in general. > > For example, such control sockets can briefly be hashed and visible > to socket dumps and packet input. > > A lot of really tricky issues involved here. Agreed, but does these still apply after explaining that paragraph/the solution? I had no intention on visiting these issues with this patch, they are left unchanged, but I can if a better solution for the original issue calls for it. Marcelo -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Marcelo Ricardo Leitner > Sent: 10 September 2015 13:54 > Em 09-09-2015 21:16, David Miller escreveu: > > From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > > Date: Wed, 9 Sep 2015 17:03:01 -0300 > > > >> So the fix then is to invert the initialization order inside > >> register_pernet_subsys() so that the control socket is created by last > >> and also block socket creation if netns initialization wasn't yet > >> performed. > > > > If we really need to we could make ->create() fail with -EAFNOSUPPORT > > if kern==1 until the protocol is fully setup. > > > > Or, instead of failing, we could make such ->create() calls block > > until the control sock init is complete or fails. > > I guess I should have written that paragraph in another order, perhaps like: > So the fix then is to deny any sctp socket creation until netns > initialization is sufficiently done. And due to that, we have to > initialize the control socket as last step in netns initialization, as > now it can't be created earlier anymore. > > Is it clearer on the intention? > > And my emphasis on userspace sockets was to highlight that a random user > could trigger it, but yes both users are affected by the issue. > > Strictly speaking, we would have to block ->create() not until the > control socket init is done but until the protocol is fully loaded. Such > condition, with this patch, is after net->sctp.auto_asconf_splist is > initialized. But for blocking until instead of just denying, we would > need some other mechanism. > > It would be better from the (sctp) user point of view but then such > solution may better belong to another layer instead and protect all > protocols at once. (I checked and couldn't find other protocols at risk > like sctp) Given that the first ->create() blocks while the protocol code loads it really wouldn't be right to error a subsequent ->create() because the load hasn't completed. I hold a semaphore across sock_create_kern() because of issues with sctp. (Current kernels are nowhere near as bad as really old ones though.) David -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/09/2015 05:06 PM, Marcelo Ricardo Leitner wrote: > Em 09-09-2015 17:30, Vlad Yasevich escreveu: >> On 09/09/2015 04:03 PM, Marcelo Ricardo Leitner wrote: >>> Consider sctp module is unloaded and is being requested because an user >>> is creating a sctp socket. >>> >>> During initialization, sctp will add the new protocol type and then >>> initialize pernet subsys: >>> >>> status = sctp_v4_protosw_init(); >>> if (status) >>> goto err_protosw_init; >>> >>> status = sctp_v6_protosw_init(); >>> if (status) >>> goto err_v6_protosw_init; >>> >>> status = register_pernet_subsys(&sctp_net_ops); >>> >>> The problem is that after those calls to sctp_v{4,6}_protosw_init(), it >>> is possible for userspace to create SCTP sockets like if the module is >>> already fully loaded. If that happens, one of the possible effects is >>> that we will have readers for net->sctp.local_addr_list list earlier >>> than expected and sctp_net_init() does not take precautions while >>> dealing with that list, leading to a potential panic but not limited to >>> that, as sctp_sock_init() will copy a bunch of blank/partially >>> initialized values from net->sctp. >>> >>> The race happens like this: >>> >>> CPU 0 | CPU 1 >>> socket() | >>> __sock_create | socket() >>> inet_create | __sock_create >>> list_for_each_entry_rcu( | >>> answer, &inetsw[sock->type], | >>> list) { | inet_create >>> /* no hits */ | >>> if (unlikely(err)) { | >>> ... | >>> request_module() | >>> /* socket creation is blocked | >>> * the module is fully loaded | >>> */ | >>> sctp_init | >>> sctp_v4_protosw_init | >>> inet_register_protosw | >>> list_add_rcu(&p->list, | >>> last_perm); | >>> | list_for_each_entry_rcu( >>> | answer, &inetsw[sock->type], >>> sctp_v6_protosw_init | list) { >>> | /* hit, so assumes protocol >>> | * is already loaded >>> | */ >>> | /* socket creation continues >>> | * before netns is initialized >>> | */ >>> register_pernet_subsys | >>> >>> Inverting the initialization order between register_pernet_subsys() and >>> sctp_v4_protosw_init() is not possible because register_pernet_subsys() >>> will create a control sctp socket, so the protocol must be already >>> visible by then. Deferring the socket creation to a work-queue is not >>> good specially because we loose the ability to handle its errors. >>> >>> So the fix then is to invert the initialization order inside >>> register_pernet_subsys() so that the control socket is created by last >>> and also block socket creation if netns initialization wasn't yet >>> performed. >>> >> >> not sure how much I like that... Wouldn't it be better >> to pull the control socket initialization stuff out into its >> own function that does something like >> >> for_each_net_rcu() >> init_control_socket(net, ...) >> >> >> Or may be even pull the control socket creation >> stuff completely into its own per-net ops operations structure >> and initialize it after the the protosw stuff has been done. >> >> -vlad > > I'm afraid error handling won't be easy then. > > But still, the control socket is not really the problem, because we don't care (much?) if > it contains zeroed values and the panic happens only if you call connect() on it. I moved > it solely because of the protection on sctp_init_sock(). > > The real problem is new sockets created by an user application while module is still > loading, because even if them don't trigger the panic, they may not be fully functional > due to improper values loaded. Can't see other good ways to protect sctp_init_sock() from > that early call (as in, prior to netns initialization). Right, I understand what the problem really is. Like you said, the simple fix is to reorder the sctp defaults initialization with protosw registration. However, that's not possible because control socket is created in the sctp defaults initialization code and needs protosw to be registered (chicken and egg issue). What I am saying is that it is kind of strange to create control socket during protocol default initialization. The control socket has nothing really to do with defaults. So, we could pull it out of the defaults initialization (sctp_net_init()) code and into its own initialization path. Then you can order sctp_net_init() such that it happens first, then protosw registration happens, then control socket initialization happens, then inet protocol registration happens. This way, we are always guaranteed that by the time user calls socket(), protocol defaults are fully initialized. > > I used the list pointer because that's null as that memory is entirely zeroed when alloced > and, after initialization, it's never null again. Works like a lock/condition without > using an extra field. > I understand this a well. What I don't particularly like is that we are re-using a list without really stating why it's now done this way. Additionally, it's not really the last that happens so it's seems kind of hacky... If we need to add new per-net initializers, we now need to make sure that the code is put in the right place. I'd just really like to have a cleaner solution... -vlad > Marcelo > >>> Fixes: 4db67e808640 ("sctp: Make the address lists per network namespace") >>> Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> >>> --- >>> net/sctp/protocol.c | 18 +++++++++++------- >>> net/sctp/socket.c | 4 ++++ >>> 2 files changed, 15 insertions(+), 7 deletions(-) >>> >>> diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c >>> index >>> 4345790ad3266c353eeac5398593c2a9ce4effda..d8f78165768a75f93f4ce4120dd5475b6a623aaf 100644 >>> --- a/net/sctp/protocol.c >>> +++ b/net/sctp/protocol.c >>> @@ -1271,12 +1271,6 @@ static int __net_init sctp_net_init(struct net *net) >>> >>> sctp_dbg_objcnt_init(net); >>> >>> - /* Initialize the control inode/socket for handling OOTB packets. */ >>> - if ((status = sctp_ctl_sock_init(net))) { >>> - pr_err("Failed to initialize the SCTP control sock\n"); >>> - goto err_ctl_sock_init; >>> - } >>> - >>> /* Initialize the local address list. */ >>> INIT_LIST_HEAD(&net->sctp.local_addr_list); >>> spin_lock_init(&net->sctp.local_addr_lock); >>> @@ -1284,11 +1278,21 @@ static int __net_init sctp_net_init(struct net *net) >>> >>> /* Initialize the address event list */ >>> INIT_LIST_HEAD(&net->sctp.addr_waitq); >>> - INIT_LIST_HEAD(&net->sctp.auto_asconf_splist); >>> spin_lock_init(&net->sctp.addr_wq_lock); >>> net->sctp.addr_wq_timer.expires = 0; >>> setup_timer(&net->sctp.addr_wq_timer, sctp_addr_wq_timeout_handler, >>> (unsigned long)net); >>> + /* sctp_init_sock() will use this to know that netns is >>> + * nearly all initialized but already good to go. >>> + */ >>> + INIT_LIST_HEAD(&net->sctp.auto_asconf_splist); >>> + >>> + /* Initialize the control inode/socket for handling OOTB packets. */ >>> + status = sctp_ctl_sock_init(net); >>> + if (status) { >>> + pr_err("Failed to initialize the SCTP control sock\n"); >>> + goto err_ctl_sock_init; >>> + } >>> >>> return 0; >>> >>> diff --git a/net/sctp/socket.c b/net/sctp/socket.c >>> index >>> 17bef01b9aa3e7f75328d39fc976f9e80d641e92..45b94deec93d0c7c1612a16922348cf2a7e65ec5 100644 >>> --- a/net/sctp/socket.c >>> +++ b/net/sctp/socket.c >>> @@ -3993,6 +3993,10 @@ static int sctp_init_sock(struct sock *sk) >>> >>> pr_debug("%s: sk:%p\n", __func__, sk); >>> >>> + /* Validate if netns is already initialized. */ >>> + if (!net->sctp.auto_asconf_splist.prev) >>> + return -ENOPROTOOPT; >>> + >>> sp = sctp_sk(sk); >>> >>> /* Initialize the SCTP per socket area. */ >>> >> > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em 10-09-2015 10:24, Vlad Yasevich escreveu: > On 09/09/2015 05:06 PM, Marcelo Ricardo Leitner wrote: >> Em 09-09-2015 17:30, Vlad Yasevich escreveu: >>> On 09/09/2015 04:03 PM, Marcelo Ricardo Leitner wrote: >>>> Consider sctp module is unloaded and is being requested because an user >>>> is creating a sctp socket. >>>> >>>> During initialization, sctp will add the new protocol type and then >>>> initialize pernet subsys: >>>> >>>> status = sctp_v4_protosw_init(); >>>> if (status) >>>> goto err_protosw_init; >>>> >>>> status = sctp_v6_protosw_init(); >>>> if (status) >>>> goto err_v6_protosw_init; >>>> >>>> status = register_pernet_subsys(&sctp_net_ops); >>>> >>>> The problem is that after those calls to sctp_v{4,6}_protosw_init(), it >>>> is possible for userspace to create SCTP sockets like if the module is >>>> already fully loaded. If that happens, one of the possible effects is >>>> that we will have readers for net->sctp.local_addr_list list earlier >>>> than expected and sctp_net_init() does not take precautions while >>>> dealing with that list, leading to a potential panic but not limited to >>>> that, as sctp_sock_init() will copy a bunch of blank/partially >>>> initialized values from net->sctp. >>>> >>>> The race happens like this: >>>> >>>> CPU 0 | CPU 1 >>>> socket() | >>>> __sock_create | socket() >>>> inet_create | __sock_create >>>> list_for_each_entry_rcu( | >>>> answer, &inetsw[sock->type], | >>>> list) { | inet_create >>>> /* no hits */ | >>>> if (unlikely(err)) { | >>>> ... | >>>> request_module() | >>>> /* socket creation is blocked | >>>> * the module is fully loaded | >>>> */ | >>>> sctp_init | >>>> sctp_v4_protosw_init | >>>> inet_register_protosw | >>>> list_add_rcu(&p->list, | >>>> last_perm); | >>>> | list_for_each_entry_rcu( >>>> | answer, &inetsw[sock->type], >>>> sctp_v6_protosw_init | list) { >>>> | /* hit, so assumes protocol >>>> | * is already loaded >>>> | */ >>>> | /* socket creation continues >>>> | * before netns is initialized >>>> | */ >>>> register_pernet_subsys | >>>> >>>> Inverting the initialization order between register_pernet_subsys() and >>>> sctp_v4_protosw_init() is not possible because register_pernet_subsys() >>>> will create a control sctp socket, so the protocol must be already >>>> visible by then. Deferring the socket creation to a work-queue is not >>>> good specially because we loose the ability to handle its errors. >>>> >>>> So the fix then is to invert the initialization order inside >>>> register_pernet_subsys() so that the control socket is created by last >>>> and also block socket creation if netns initialization wasn't yet >>>> performed. >>>> >>> >>> not sure how much I like that... Wouldn't it be better >>> to pull the control socket initialization stuff out into its >>> own function that does something like >>> >>> for_each_net_rcu() >>> init_control_socket(net, ...) >>> >>> >>> Or may be even pull the control socket creation >>> stuff completely into its own per-net ops operations structure >>> and initialize it after the the protosw stuff has been done. >>> >>> -vlad >> >> I'm afraid error handling won't be easy then. >> >> But still, the control socket is not really the problem, because we don't care (much?) if >> it contains zeroed values and the panic happens only if you call connect() on it. I moved >> it solely because of the protection on sctp_init_sock(). >> >> The real problem is new sockets created by an user application while module is still >> loading, because even if them don't trigger the panic, they may not be fully functional >> due to improper values loaded. Can't see other good ways to protect sctp_init_sock() from >> that early call (as in, prior to netns initialization). > > Right, I understand what the problem really is. Like you said, the simple fix is to > reorder the sctp defaults initialization with protosw registration. However, that's > not possible because control socket is created in the sctp defaults initialization code > and needs protosw to be registered (chicken and egg issue). Yes, same page then, cool. > What I am saying is that it is kind of strange to create control socket during protocol > default initialization. The control socket has nothing really to do with defaults. So, > we could pull it out of the defaults initialization (sctp_net_init()) code and into its > own initialization path. I don't really see sctp_net_init() as a pure defaults initialization routine. It's the callback for new netns's, so it should initialize anything needed for a new netns, no? > Then you can order sctp_net_init() such that it happens first, then protosw registration > happens, then control socket initialization happens, then inet protocol registration happens. > > This way, we are always guaranteed that by the time user calls socket(), protocol > defaults are fully initialized. Okay, that works for module loading stage, but then how would we handle new netns's? We have to create the control socket per netns and AFAICT sctp_net_init() is the only hook called when a new netns is being created. Then if we move it a workqueue that is scheduled by sctp_net_init(), we loose the ability to handle its errors by propagating through sctp_net_init() return value, not good. >> I used the list pointer because that's null as that memory is entirely zeroed when alloced >> and, after initialization, it's never null again. Works like a lock/condition without >> using an extra field. >> > > I understand this a well. What I don't particularly like is that we are re-using > a list without really stating why it's now done this way. Additionally, it's not really > the last that happens so it's seems kind of hacky... If we need to add new > per-net initializers, we now need to make sure that the code is put in the right > place. I'd just really like to have a cleaner solution... Ok, got you. We could add a dedicated flag/bit for that then, if reusing the list is not clear enough. Or, as we are discussing on the other part of thread, we could make it block and wait for the initialization, probably using some wait_queue. I'm still thinking on something this way, likely something more below than sctp then. Thanks, Marcelo -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Em 10-09-2015 10:02, David Laight escreveu: > From: Marcelo Ricardo Leitner >> Sent: 10 September 2015 13:54 >> Em 09-09-2015 21:16, David Miller escreveu: >>> From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> >>> Date: Wed, 9 Sep 2015 17:03:01 -0300 >>> >>>> So the fix then is to invert the initialization order inside >>>> register_pernet_subsys() so that the control socket is created by last >>>> and also block socket creation if netns initialization wasn't yet >>>> performed. >>> >>> If we really need to we could make ->create() fail with -EAFNOSUPPORT >>> if kern==1 until the protocol is fully setup. >>> >>> Or, instead of failing, we could make such ->create() calls block >>> until the control sock init is complete or fails. >> >> I guess I should have written that paragraph in another order, perhaps like: >> So the fix then is to deny any sctp socket creation until netns >> initialization is sufficiently done. And due to that, we have to >> initialize the control socket as last step in netns initialization, as >> now it can't be created earlier anymore. >> >> Is it clearer on the intention? >> >> And my emphasis on userspace sockets was to highlight that a random user >> could trigger it, but yes both users are affected by the issue. >> >> Strictly speaking, we would have to block ->create() not until the >> control socket init is done but until the protocol is fully loaded. Such >> condition, with this patch, is after net->sctp.auto_asconf_splist is >> initialized. But for blocking until instead of just denying, we would >> need some other mechanism. >> >> It would be better from the (sctp) user point of view but then such >> solution may better belong to another layer instead and protect all >> protocols at once. (I checked and couldn't find other protocols at risk >> like sctp) > > Given that the first ->create() blocks while the protocol code loads > it really wouldn't be right to error a subsequent ->create() because > the load hasn't completed. Can't say I don't agree with you, but at the same time, there are other temporary errors that can happen and that the user should just retry. This would be just another condition in a trade off for avoiding complexity. > I hold a semaphore across sock_create_kern() because of issues with sctp. > (Current kernels are nowhere near as bad as really old ones though.) Oh, that's not good to hear. I'll experiment with that later, try to catch some bugs. :) Marcelo -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Marcelo Ricardo > Sent: 10 September 2015 15:36 ... > > Given that the first ->create() blocks while the protocol code loads > > it really wouldn't be right to error a subsequent ->create() because > > the load hasn't completed. > > Can't say I don't agree with you, but at the same time, there are other > temporary errors that can happen and that the user should just retry. > This would be just another condition in a trade off for avoiding complexity. We do retry, but the delay messes up out test scripts :-( > > I hold a semaphore across sock_create_kern() because of issues with sctp. > > (Current kernels are nowhere near as bad as really old ones though.) > > Oh, that's not good to hear. I'll experiment with that later, try to > catch some bugs. :) I mean REALLY old - like 2.6.12 (FC3). I'm pretty sure I've seen oops as well as create failing. We don't create enough sockets for the semaphore to be a problem. OTOH I've a current problem with a customer using RHEL5.8 (basically 2.6.18). They might manage to move to RHEL6 (2.6.32) - but that could take a year or two. RH might be pulling some of the SCTP fixes, but I doubt they get priority. David -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 4345790ad3266c353eeac5398593c2a9ce4effda..d8f78165768a75f93f4ce4120dd5475b6a623aaf 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -1271,12 +1271,6 @@ static int __net_init sctp_net_init(struct net *net) sctp_dbg_objcnt_init(net); - /* Initialize the control inode/socket for handling OOTB packets. */ - if ((status = sctp_ctl_sock_init(net))) { - pr_err("Failed to initialize the SCTP control sock\n"); - goto err_ctl_sock_init; - } - /* Initialize the local address list. */ INIT_LIST_HEAD(&net->sctp.local_addr_list); spin_lock_init(&net->sctp.local_addr_lock); @@ -1284,11 +1278,21 @@ static int __net_init sctp_net_init(struct net *net) /* Initialize the address event list */ INIT_LIST_HEAD(&net->sctp.addr_waitq); - INIT_LIST_HEAD(&net->sctp.auto_asconf_splist); spin_lock_init(&net->sctp.addr_wq_lock); net->sctp.addr_wq_timer.expires = 0; setup_timer(&net->sctp.addr_wq_timer, sctp_addr_wq_timeout_handler, (unsigned long)net); + /* sctp_init_sock() will use this to know that netns is + * nearly all initialized but already good to go. + */ + INIT_LIST_HEAD(&net->sctp.auto_asconf_splist); + + /* Initialize the control inode/socket for handling OOTB packets. */ + status = sctp_ctl_sock_init(net); + if (status) { + pr_err("Failed to initialize the SCTP control sock\n"); + goto err_ctl_sock_init; + } return 0; diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 17bef01b9aa3e7f75328d39fc976f9e80d641e92..45b94deec93d0c7c1612a16922348cf2a7e65ec5 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3993,6 +3993,10 @@ static int sctp_init_sock(struct sock *sk) pr_debug("%s: sk:%p\n", __func__, sk); + /* Validate if netns is already initialized. */ + if (!net->sctp.auto_asconf_splist.prev) + return -ENOPROTOOPT; + sp = sctp_sk(sk); /* Initialize the SCTP per socket area. */
Consider sctp module is unloaded and is being requested because an user is creating a sctp socket. During initialization, sctp will add the new protocol type and then initialize pernet subsys: status = sctp_v4_protosw_init(); if (status) goto err_protosw_init; status = sctp_v6_protosw_init(); if (status) goto err_v6_protosw_init; status = register_pernet_subsys(&sctp_net_ops); The problem is that after those calls to sctp_v{4,6}_protosw_init(), it is possible for userspace to create SCTP sockets like if the module is already fully loaded. If that happens, one of the possible effects is that we will have readers for net->sctp.local_addr_list list earlier than expected and sctp_net_init() does not take precautions while dealing with that list, leading to a potential panic but not limited to that, as sctp_sock_init() will copy a bunch of blank/partially initialized values from net->sctp. The race happens like this: CPU 0 | CPU 1 socket() | __sock_create | socket() inet_create | __sock_create list_for_each_entry_rcu( | answer, &inetsw[sock->type], | list) { | inet_create /* no hits */ | if (unlikely(err)) { | ... | request_module() | /* socket creation is blocked | * the module is fully loaded | */ | sctp_init | sctp_v4_protosw_init | inet_register_protosw | list_add_rcu(&p->list, | last_perm); | | list_for_each_entry_rcu( | answer, &inetsw[sock->type], sctp_v6_protosw_init | list) { | /* hit, so assumes protocol | * is already loaded | */ | /* socket creation continues | * before netns is initialized | */ register_pernet_subsys | Inverting the initialization order between register_pernet_subsys() and sctp_v4_protosw_init() is not possible because register_pernet_subsys() will create a control sctp socket, so the protocol must be already visible by then. Deferring the socket creation to a work-queue is not good specially because we loose the ability to handle its errors. So the fix then is to invert the initialization order inside register_pernet_subsys() so that the control socket is created by last and also block socket creation if netns initialization wasn't yet performed. Fixes: 4db67e808640 ("sctp: Make the address lists per network namespace") Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> --- net/sctp/protocol.c | 18 +++++++++++------- net/sctp/socket.c | 4 ++++ 2 files changed, 15 insertions(+), 7 deletions(-)