diff --git a/[refs] b/[refs] index f4fcf6757f08..b786c8b5b82b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08e9897d512fe7a67e46209543b3815b57a36dc7 +refs/heads/master: 41bdecf17e6dba92256c65972ec79a482d978be5 diff --git a/trunk/net/decnet/dn_dev.c b/trunk/net/decnet/dn_dev.c index b5ef237c8a74..5790d660bc7d 100644 --- a/trunk/net/decnet/dn_dev.c +++ b/trunk/net/decnet/dn_dev.c @@ -828,13 +828,17 @@ static int dn_dev_get_first(struct net_device *dev, __le16 *addr) struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr; struct dn_ifaddr *ifa; int rv = -ENODEV; + if (dn_db == NULL) goto out; + + rtnl_lock(); ifa = dn_db->ifa_list; if (ifa != NULL) { *addr = ifa->ifa_local; rv = 0; } + rtnl_unlock(); out: return rv; }