stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Patch "ipv6: udp: fix UDP_MIB_IGNOREDMULTI updates" has been added to the 4.5-stable tree
@ 2016-04-16 16:35 gregkh
  0 siblings, 0 replies; only message in thread
From: gregkh @ 2016-04-16 16:35 UTC (permalink / raw)
  To: edumazet, davem, gregkh, rick.jones2, willemb; +Cc: stable, stable-commits


This is a note to let you know that I've just added the patch titled

    ipv6: udp: fix UDP_MIB_IGNOREDMULTI updates

to the 4.5-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     ipv6-udp-fix-udp_mib_ignoredmulti-updates.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Sat Apr 16 09:15:18 PDT 2016
From: Eric Dumazet <edumazet@google.com>
Date: Tue, 29 Mar 2016 08:43:41 -0700
Subject: ipv6: udp: fix UDP_MIB_IGNOREDMULTI updates

From: Eric Dumazet <edumazet@google.com>

[ Upstream commit 2d4212261fdf13e29728ddb5ea9d60c342cc92b5 ]

IPv6 counters updates use a different macro than IPv4.

Fixes: 36cbb2452cbaf ("udp: Increment UDP_MIB_IGNOREDMULTI for arriving unmatched multicasts")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Rick Jones <rick.jones2@hp.com>
Cc: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/ipv6/udp.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -883,8 +883,8 @@ start_lookup:
 		flush_stack(stack, count, skb, count - 1);
 	} else {
 		if (!inner_flushed)
-			UDP_INC_STATS_BH(net, UDP_MIB_IGNOREDMULTI,
-					 proto == IPPROTO_UDPLITE);
+			UDP6_INC_STATS_BH(net, UDP_MIB_IGNOREDMULTI,
+					  proto == IPPROTO_UDPLITE);
 		consume_skb(skb);
 	}
 	return 0;


Patches currently in stable-queue which might be from edumazet@google.com are

queue-4.5/tcp-dccp-remove-obsolete-warn_on-in-icmp-handlers.patch
queue-4.5/ipv6-udp-fix-udp_mib_ignoredmulti-updates.patch
queue-4.5/net-fix-use-after-free-in-the-recvmmsg-exit-path.patch
queue-4.5/bonding-fix-bond_get_stats.patch
queue-4.5/net-bcmgenet-fix-dma-api-length-mismatch.patch

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-04-16 16:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-16 16:35 Patch "ipv6: udp: fix UDP_MIB_IGNOREDMULTI updates" has been added to the 4.5-stable tree gregkh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).