X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=net%2Fbridge%2Fbr_stp_bpdu.c;h=3d9a55d3822f0605eb333b22101833723cdd61d7;hb=b5ed54e94d324f17c97852296d61a143f01b227a;hp=35cf27087b561d6e9955fd75b4b03213a6e9e8d8;hpb=61391cde9eefac5cfcf6d214aa80c77e58b1626b;p=net-next-2.6.git

diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c
index 35cf27087b5..3d9a55d3822 100644
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
@@ -141,10 +141,6 @@ void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb,
 	struct net_bridge *br;
 	const unsigned char *buf;
 
-	if (!br_port_exists(dev))
-		goto err;
-	p = br_port_get_rcu(dev);
-
 	if (!pskb_may_pull(skb, 4))
 		goto err;
 
@@ -153,6 +149,10 @@ void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb,
 	if (buf[0] != 0 || buf[1] != 0 || buf[2] != 0)
 		goto err;
 
+	p = br_port_get_rcu(dev);
+	if (!p)
+		goto err;
+
 	br = p->br;
 	spin_lock(&br->lock);