dropped queue-4.4/netlink-not-trim-skb-for-mmaped-socket-when-dump.patch

diff --git a/queue-4.4/netlink-not-trim-skb-for-mmaped-socket-when-dump.patch b/queue-4.4/netlink-not-trim-skb-for-mmaped-socket-when-dump.patch
deleted file mode 100644 (file)
index 89ad632..0000000
--- a/queue-4.4/netlink-not-trim-skb-for-mmaped-socket-when-dump.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From aa3a022094fac7f6e48050e139fa8a5a2e3265ce Mon Sep 17 00:00:00 2001
-From: Ken-ichirou MATSUZAWA <chamaken@gmail.com>
-Date: Fri, 29 Jan 2016 10:45:50 +0900
-Subject: netlink: not trim skb for mmaped socket when dump
-
-From: Ken-ichirou MATSUZAWA <chamaken@gmail.com>
-
-commit aa3a022094fac7f6e48050e139fa8a5a2e3265ce upstream.
-
-We should not trim skb for mmaped socket since its buf size is fixed
-and userspace will read as frame which data equals head. mmaped
-socket will not call recvmsg, means max_recvmsg_len is 0,
-skb_reserve was not called before commit: db65a3aaf29e.
-
-Fixes: db65a3aaf29e (netlink: Trim skb to alloc size to avoid MSG_TRUNC)
-Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/netlink/af_netlink.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/net/netlink/af_netlink.c
-+++ b/net/netlink/af_netlink.c
-@@ -2179,7 +2179,8 @@ static int netlink_dump(struct sock *sk)
-        * reasonable static buffer based on the expected largest dump of a
-        * single netdev. The outcome is MSG_TRUNC error.
-        */
--      skb_reserve(skb, skb_tailroom(skb) - alloc_size);
-+      if (!netlink_rx_is_mmaped(sk))
-+              skb_reserve(skb, skb_tailroom(skb) - alloc_size);
-       netlink_skb_set_owner_r(skb, sk);
- 
-       if (nlk->dump_done_errno > 0)

diff --git a/queue-4.4/series b/queue-4.4/series
index f280351374428d3076a90253fa46aa0ddfd762d1..1b31492a8d991c02bd8b50201b9cf6dfdcb6f37e 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -49,5 +49,4 @@ alsa-fm801-explicitly-free-irq-line.patch
 alsa-fm801-propagate-tuner_only-bit-when-autodetected.patch
 alsa-fm801-detect-fm-only-card-earlier.patch
 netfilter-nfnetlink-use-original-skbuff-when-acking-batches.patch
-netlink-not-trim-skb-for-mmaped-socket-when-dump.patch
 xfrm-fix-crash-in-xfrm_msg_getsa-netlink-handler.patch