diff --git a/[refs] b/[refs] index cb81cf14bf2b..050bff321173 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8a623bf836ccfab09a5a6daf62116f455082e6e +refs/heads/master: d0490cfdf440fded2c292cfb8bb9272fc9ef6943 diff --git a/trunk/net/ipv4/ipmr.c b/trunk/net/ipv4/ipmr.c index 630a56df7b47..99508d66a642 100644 --- a/trunk/net/ipv4/ipmr.c +++ b/trunk/net/ipv4/ipmr.c @@ -483,8 +483,10 @@ static int vif_add(struct net *net, struct vifctl *vifc, int mrtsock) return -EINVAL; } - if ((in_dev = __in_dev_get_rtnl(dev)) == NULL) + if ((in_dev = __in_dev_get_rtnl(dev)) == NULL) { + dev_put(dev); return -EADDRNOTAVAIL; + } IPV4_DEVCONF(in_dev->cnf, MC_FORWARDING)++; ip_rt_multicast_event(in_dev);