diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2016-01-05 10:46:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-05 22:46:17 +0100 |
| commit | ff62198553e43cdffa9d539f6165d3e83f8a42bc (patch) | |
| tree | 12dd61853d73dcf5a457ed32b5d3c50f346f5544 | |
| parent | af_unix: Fix splice-bind deadlock (diff) | |
| download | linux-ff62198553e43cdffa9d539f6165d3e83f8a42bc.tar.xz linux-ff62198553e43cdffa9d539f6165d3e83f8a42bc.zip | |
bridge: Only call /sbin/bridge-stp for the initial network namespace
[I stole this patch from Eric Biederman. He wrote:]
> There is no defined mechanism to pass network namespace information
> into /sbin/bridge-stp therefore don't even try to invoke it except
> for bridge devices in the initial network namespace.
>
> It is possible for unprivileged users to cause /sbin/bridge-stp to be
> invoked for any network device name which if /sbin/bridge-stp does not
> guard against unreasonable arguments or being invoked twice on the
> same network device could cause problems.
[Hannes: changed patch using netns_eq]
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bridge/br_stp_if.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 12045dea276c..8a7ada8bb947 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -142,7 +142,10 @@ static void br_stp_start(struct net_bridge *br) char *envp[] = { NULL }; struct net_bridge_port *p; - r = call_usermodehelper(BR_STP_PROG, argv, envp, UMH_WAIT_PROC); + if (net_eq(dev_net(br->dev), &init_net)) + r = call_usermodehelper(BR_STP_PROG, argv, envp, UMH_WAIT_PROC); + else + r = -ENOENT; spin_lock_bh(&br->lock); |