* [PATCH] macsec: missing dev_put() on error in macsec_newlink()
@ 2018-03-21 8:09 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2018-03-21 8:09 UTC (permalink / raw)
To: David S. Miller, Sabrina Dubroca
Cc: David Ahern, David Windsor, Elena Reshetova, Jason A. Donenfeld,
Matthias Schiffer, Johannes Berg, Felix Walter,
Girish Moodalbail, netdev, kernel-janitors
We moved the dev_hold(real_dev); call earlier in the function but forgot
to update the error paths.
Fixes: 0759e552bce7 ("macsec: fix negative refcnt on parent link")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 7de88b33d5b9..9cbb0c8a896a 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -3277,7 +3277,7 @@ static int macsec_newlink(struct net *net, struct net_device *dev,
err = netdev_upper_dev_link(real_dev, dev, extack);
if (err < 0)
- goto unregister;
+ goto put_dev;
/* need to be already registered so that ->init has run and
* the MAC addr is set
@@ -3316,7 +3316,8 @@ static int macsec_newlink(struct net *net, struct net_device *dev,
macsec_del_dev(macsec);
unlink:
netdev_upper_dev_unlink(real_dev, dev);
-unregister:
+put_dev:
+ dev_put(real_dev);
unregister_netdevice(dev);
return err;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] macsec: missing dev_put() on error in macsec_newlink()
@ 2018-03-21 8:09 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2018-03-21 8:09 UTC (permalink / raw)
To: David S. Miller, Sabrina Dubroca
Cc: David Ahern, David Windsor, Elena Reshetova, Jason A. Donenfeld,
Matthias Schiffer, Johannes Berg, Felix Walter,
Girish Moodalbail, netdev, kernel-janitors
We moved the dev_hold(real_dev); call earlier in the function but forgot
to update the error paths.
Fixes: 0759e552bce7 ("macsec: fix negative refcnt on parent link")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 7de88b33d5b9..9cbb0c8a896a 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -3277,7 +3277,7 @@ static int macsec_newlink(struct net *net, struct net_device *dev,
err = netdev_upper_dev_link(real_dev, dev, extack);
if (err < 0)
- goto unregister;
+ goto put_dev;
/* need to be already registered so that ->init has run and
* the MAC addr is set
@@ -3316,7 +3316,8 @@ static int macsec_newlink(struct net *net, struct net_device *dev,
macsec_del_dev(macsec);
unlink:
netdev_upper_dev_unlink(real_dev, dev);
-unregister:
+put_dev:
+ dev_put(real_dev);
unregister_netdevice(dev);
return err;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] macsec: missing dev_put() on error in macsec_newlink()
2018-03-21 8:09 ` Dan Carpenter
@ 2018-03-22 18:31 ` David Miller
-1 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2018-03-22 18:31 UTC (permalink / raw)
To: dan.carpenter
Cc: sd, dsahern, dwindsor, elena.reshetova, Jason, mschiffer,
johannes.berg, felix.walter, girish.moodalbail, netdev,
kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 21 Mar 2018 11:09:01 +0300
> We moved the dev_hold(real_dev); call earlier in the function but forgot
> to update the error paths.
>
> Fixes: 0759e552bce7 ("macsec: fix negative refcnt on parent link")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied and queued up for -stable, thanks Dan.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] macsec: missing dev_put() on error in macsec_newlink()
@ 2018-03-22 18:31 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2018-03-22 18:31 UTC (permalink / raw)
To: dan.carpenter
Cc: sd, dsahern, dwindsor, elena.reshetova, Jason, mschiffer,
johannes.berg, felix.walter, girish.moodalbail, netdev,
kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 21 Mar 2018 11:09:01 +0300
> We moved the dev_hold(real_dev); call earlier in the function but forgot
> to update the error paths.
>
> Fixes: 0759e552bce7 ("macsec: fix negative refcnt on parent link")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied and queued up for -stable, thanks Dan.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-03-22 18:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-21 8:09 [PATCH] macsec: missing dev_put() on error in macsec_newlink() Dan Carpenter
2018-03-21 8:09 ` Dan Carpenter
2018-03-22 18:31 ` David Miller
2018-03-22 18:31 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.