[PATCH 3.14 36/59] bridge: Only call /sbin/bridge-stp for the initial network namespace
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2016-01-27 20:08:02
Also in:
lkml
3.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hannes Frederic Sowa <redacted> [ Upstream commit ff62198553e43cdffa9d539f6165d3e83f8a42bc ] [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 <redacted> Signed-off-by: Eric W. Biederman <redacted> Signed-off-by: Hannes Frederic Sowa <redacted> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- net/bridge/br_stp_if.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c@@ -128,7 +128,10 @@ static void br_stp_start(struct net_brid char *argv[] = { BR_STP_PROG, br->dev->name, "start", NULL }; char *envp[] = { NULL }; - 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);