From: Krzysztof Halasa Date: Mon, 19 May 2008 17:00:51 +0000 (+0200) Subject: WAN: protect HDLC proto list while insmod/rmmod X-Git-Tag: v2.6.26-rc4~7^2~1^2~6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fa701bd24d6e64a2283d6fa386554775fd4336e7;p=linux-2.6-omap-h63xx.git WAN: protect HDLC proto list while insmod/rmmod WAN: protect protocol list in hdlc.c with RTNL. Signed-off-by: Krzysztof HaƂasa Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c index 9a83c9d5b8c..7f984895b0d 100644 --- a/drivers/net/wan/hdlc.c +++ b/drivers/net/wan/hdlc.c @@ -43,8 +43,7 @@ static const char* version = "HDLC support module revision 1.22"; #undef DEBUG_LINK -static struct hdlc_proto *first_proto = NULL; - +static struct hdlc_proto *first_proto; static int hdlc_change_mtu(struct net_device *dev, int new_mtu) { @@ -314,21 +313,25 @@ void detach_hdlc_protocol(struct net_device *dev) void register_hdlc_protocol(struct hdlc_proto *proto) { + rtnl_lock(); proto->next = first_proto; first_proto = proto; + rtnl_unlock(); } void unregister_hdlc_protocol(struct hdlc_proto *proto) { - struct hdlc_proto **p = &first_proto; - while (*p) { - if (*p == proto) { - *p = proto->next; - return; - } + struct hdlc_proto **p; + + rtnl_lock(); + p = &first_proto; + while (*p != proto) { + BUG_ON(!*p); p = &((*p)->next); } + *p = proto->next; + rtnl_unlock(); }