From: Greg Kroah-Hartman Date: Mon, 11 Oct 2021 08:37:02 +0000 (+0200) Subject: 5.14-stable patches X-Git-Tag: v5.14.12~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f68f32bd2fba70a4a4c4ae09433c9d657b63a223;p=thirdparty%2Fkernel%2Fstable-queue.git 5.14-stable patches added patches: dsa-tag_dsa-fix-mask-for-trunked-packets.patch --- diff --git a/queue-5.14/dsa-tag_dsa-fix-mask-for-trunked-packets.patch b/queue-5.14/dsa-tag_dsa-fix-mask-for-trunked-packets.patch new file mode 100644 index 00000000000..a566e66c7fb --- /dev/null +++ b/queue-5.14/dsa-tag_dsa-fix-mask-for-trunked-packets.patch @@ -0,0 +1,35 @@ +From b44d52a50bc6f191f0ae03f65de8401f3ef039b3 Mon Sep 17 00:00:00 2001 +From: Andrew Lunn +Date: Sun, 3 Oct 2021 17:50:53 +0200 +Subject: dsa: tag_dsa: Fix mask for trunked packets + +From: Andrew Lunn + +commit b44d52a50bc6f191f0ae03f65de8401f3ef039b3 upstream. + +A packet received on a trunk will have bit 2 set in Forward DSA tagged +frame. Bit 1 can be either 0 or 1 and is otherwise undefined and bit 0 +indicates the frame CFI. Masking with 7 thus results in frames as +being identified as being from a trunk when in fact they are not. Fix +the mask to just look at bit 2. + +Fixes: 5b60dadb71db ("net: dsa: tag_dsa: Support reception of packets from LAG devices") +Signed-off-by: Andrew Lunn +Reviewed-by: Vladimir Oltean +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/dsa/tag_dsa.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/dsa/tag_dsa.c ++++ b/net/dsa/tag_dsa.c +@@ -176,7 +176,7 @@ static struct sk_buff *dsa_rcv_ll(struct + case DSA_CMD_FORWARD: + skb->offload_fwd_mark = 1; + +- trunk = !!(dsa_header[1] & 7); ++ trunk = !!(dsa_header[1] & 4); + break; + + case DSA_CMD_TO_CPU: diff --git a/queue-5.14/series b/queue-5.14/series index 4c91add6044..6a3bfe68832 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -149,3 +149,4 @@ x86-fpu-restore-the-masking-out-of-reserved-mxcsr-bits.patch x86-entry-correct-reference-to-intended-config_64_bit.patch x86-entry-clear-x86_feature_smap-when-config_x86_smap-n.patch x86-hpet-use-another-crystalball-to-evaluate-hpet-usability.patch +dsa-tag_dsa-fix-mask-for-trunked-packets.patch