From: Greg Kroah-Hartman Date: Mon, 28 May 2018 12:41:41 +0000 (+0200) Subject: drop macsec-missing-dev_put-on-error-in-macsec_newlink.patch X-Git-Tag: v3.18.111~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34d6852045f87b0d3a84e14a340af9338ff572f9;p=thirdparty%2Fkernel%2Fstable-queue.git drop macsec-missing-dev_put-on-error-in-macsec_newlink.patch --- diff --git a/queue-4.14/macsec-missing-dev_put-on-error-in-macsec_newlink.patch b/queue-4.14/macsec-missing-dev_put-on-error-in-macsec_newlink.patch deleted file mode 100644 index dfbbd986e7d..00000000000 --- a/queue-4.14/macsec-missing-dev_put-on-error-in-macsec_newlink.patch +++ /dev/null @@ -1,42 +0,0 @@ -From foo@baz Sun May 27 16:52:54 CEST 2018 -From: Dan Carpenter -Date: Wed, 21 Mar 2018 11:09:01 +0300 -Subject: macsec: missing dev_put() on error in macsec_newlink() - -From: Dan Carpenter - -[ Upstream commit 5dcd8400884cc4a043a6d4617e042489e5d566a9 ] - -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 -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/macsec.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- a/drivers/net/macsec.c -+++ b/drivers/net/macsec.c -@@ -3248,7 +3248,7 @@ static int macsec_newlink(struct net *ne - - err = netdev_upper_dev_link(real_dev, dev); - if (err < 0) -- goto unregister; -+ goto put_dev; - - /* need to be already registered so that ->init has run and - * the MAC addr is set -@@ -3284,7 +3284,8 @@ del_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; - } diff --git a/queue-4.14/series b/queue-4.14/series index 2c7620f5188..e6394f7b097 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -283,7 +283,6 @@ net-sched-fix-idr-leak-in-the-error-path-of-tcp_pedit_init.patch net-sched-fix-idr-leak-in-the-error-path-of-__tcf_ipt_init.patch net-sched-fix-idr-leak-in-the-error-path-of-tcf_skbmod_init.patch net-dsa-fix-functional-dsa-loop-dependency-on-fixed_phy.patch -macsec-missing-dev_put-on-error-in-macsec_newlink.patch drm-ast-fixed-1280x800-display-issue.patch mm-mempolicy.c-avoid-use-uninitialized-preferred_node.patch mm-thp-do-not-cause-memcg-oom-for-thp.patch diff --git a/queue-4.9/macsec-missing-dev_put-on-error-in-macsec_newlink.patch b/queue-4.9/macsec-missing-dev_put-on-error-in-macsec_newlink.patch deleted file mode 100644 index 771c2b7ed7a..00000000000 --- a/queue-4.9/macsec-missing-dev_put-on-error-in-macsec_newlink.patch +++ /dev/null @@ -1,42 +0,0 @@ -From foo@baz Sun May 27 17:33:38 CEST 2018 -From: Dan Carpenter -Date: Wed, 21 Mar 2018 11:09:01 +0300 -Subject: macsec: missing dev_put() on error in macsec_newlink() - -From: Dan Carpenter - -[ Upstream commit 5dcd8400884cc4a043a6d4617e042489e5d566a9 ] - -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 -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/macsec.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- a/drivers/net/macsec.c -+++ b/drivers/net/macsec.c -@@ -3244,7 +3244,7 @@ static int macsec_newlink(struct net *ne - - err = netdev_upper_dev_link(real_dev, dev); - if (err < 0) -- goto unregister; -+ goto put_dev; - - /* need to be already registered so that ->init has run and - * the MAC addr is set -@@ -3280,7 +3280,8 @@ del_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; - } diff --git a/queue-4.9/series b/queue-4.9/series index 3aaf4b658a8..8c6312152c6 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -209,7 +209,6 @@ kbuild-make-scripts-adjust_autoksyms.sh-robust-against-timestamp-races.patch rdma-ucma-correct-option-size-check-using-optlen.patch rdma-qedr-fix-qp-s-ack-timeout-configuration.patch rdma-qedr-fix-rc-initialization-on-cnq-allocation-failure.patch -macsec-missing-dev_put-on-error-in-macsec_newlink.patch mm-mempolicy.c-avoid-use-uninitialized-preferred_node.patch mm-thp-do-not-cause-memcg-oom-for-thp.patch selftests-ftrace-add-probe-event-argument-syntax-testcase.patch