From 52324de9d09adeede03938cd02fac765a36ab143 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 6 May 2020 11:03:12 +0200 Subject: [PATCH] dropped queue-4.4/netlink-not-trim-skb-for-mmaped-socket-when-dump.patch --- ...trim-skb-for-mmaped-socket-when-dump.patch | 35 ------------------- queue-4.4/series | 1 - 2 files changed, 36 deletions(-) delete mode 100644 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 index 89ad6328c75..00000000000 --- 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 -Date: Fri, 29 Jan 2016 10:45:50 +0900 -Subject: netlink: not trim skb for mmaped socket when dump - -From: Ken-ichirou MATSUZAWA - -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 -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman - ---- - 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 f2803513744..1b31492a8d9 100644 --- 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 -- 2.47.3