From: Greg Kroah-Hartman Date: Sun, 3 Nov 2019 19:14:31 +0000 (+0100) Subject: drop broken patch (thought I did it earlier...) X-Git-Tag: v4.4.199~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11c122825fbbb611eb8d304f6ab84c40a6a388f0;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken patch (thought I did it earlier...) --- diff --git a/queue-4.19/nl80211-fix-validation-of-mesh-path-nexthop.patch b/queue-4.19/nl80211-fix-validation-of-mesh-path-nexthop.patch deleted file mode 100644 index 208e227d3e2..00000000000 --- a/queue-4.19/nl80211-fix-validation-of-mesh-path-nexthop.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1fab1b89e2e8f01204a9c05a39fd0b6411a48593 Mon Sep 17 00:00:00 2001 -From: Markus Theil -Date: Tue, 29 Oct 2019 10:30:03 +0100 -Subject: nl80211: fix validation of mesh path nexthop - -From: Markus Theil - -commit 1fab1b89e2e8f01204a9c05a39fd0b6411a48593 upstream. - -Mesh path nexthop should be a ethernet address, but current validation -checks against 4 byte integers. - -Cc: stable@vger.kernel.org -Fixes: 2ec600d672e74 ("nl80211/cfg80211: support for mesh, sta dumping") -Signed-off-by: Markus Theil -Link: https://lore.kernel.org/r/20191029093003.10355-1-markus.theil@tu-ilmenau.de -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman - ---- - net/wireless/nl80211.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/net/wireless/nl80211.c -+++ b/net/wireless/nl80211.c -@@ -284,7 +284,7 @@ static const struct nla_policy nl80211_p - [NL80211_ATTR_MNTR_FLAGS] = { /* NLA_NESTED can't be empty */ }, - [NL80211_ATTR_MESH_ID] = { .type = NLA_BINARY, - .len = IEEE80211_MAX_MESH_ID_LEN }, -- [NL80211_ATTR_MPATH_NEXT_HOP] = { .type = NLA_U32 }, -+ [NL80211_ATTR_MPATH_NEXT_HOP] = { .type = NLA_32, .len = ETH_ALEN }, - - [NL80211_ATTR_REG_ALPHA2] = { .type = NLA_STRING, .len = 2 }, - [NL80211_ATTR_REG_RULES] = { .type = NLA_NESTED }, diff --git a/queue-4.19/series b/queue-4.19/series index bcaf1527b72..d3d1c9e202a 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -111,4 +111,3 @@ alsa-bebob-fix-prototype-of-helper-function-to-return-negative-value.patch alsa-hda-realtek-fix-2-front-mics-of-codec-0x623.patch alsa-hda-realtek-add-support-for-alc623.patch uas-revert-commit-3ae62a42090f-uas-fix-alignment-of-scatter-gather-segments.patch -nl80211-fix-validation-of-mesh-path-nexthop.patch