From: Greg Kroah-Hartman Date: Mon, 4 May 2020 13:56:48 +0000 (+0200) Subject: drop queue-4.4/netlink-not-trim-skb-for-mmaped-socket-when-dump.patch X-Git-Tag: v4.4.222~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=adf415b3ed2c951c6136e6fa061e593a4b30c783;p=thirdparty%2Fkernel%2Fstable-queue.git drop 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 9eae2a5f40d..3fcf67c1a53 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -14,5 +14,4 @@ perf-x86-fix-uninitialized-value-usage.patch exynos4-is-fix-a-format-string-bug.patch asoc-wm8960-fix-wm8960_sysclk_pll-mode.patch asoc-imx-spdif-fix-crash-on-suspend.patch -netlink-not-trim-skb-for-mmaped-socket-when-dump.patch asoc-fsl_ssi-remove-explicit-register-defaults.patch