4.4-stable patches

added patches:
	xfrm_user-fix-return-value-from-xfrm_user_rcv_msg.patch

diff --git a/queue-4.4/series b/queue-4.4/series
index 7c8d2cff99ccfeab5863147d54c3495e2acd0079..d9697b7bc0d5f79386ec22bb813f6f78b106b27d 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -41,3 +41,4 @@ perf-remove-superfluous-allocation-error-check.patch
 tcp-fix-tcp_repair_queue-bound-checking.patch
 bdi-fix-oops-in-wb_workfn.patch
 f2fs-fix-a-dead-loop-in-f2fs_fiemap.patch
+xfrm_user-fix-return-value-from-xfrm_user_rcv_msg.patch

diff --git a/queue-4.4/xfrm_user-fix-return-value-from-xfrm_user_rcv_msg.patch b/queue-4.4/xfrm_user-fix-return-value-from-xfrm_user_rcv_msg.patch
new file mode 100644 (file)
index 0000000..7441000
--- /dev/null
+++ b/queue-4.4/xfrm_user-fix-return-value-from-xfrm_user_rcv_msg.patch
@@ -0,0 +1,40 @@
+From 83e2d0587ae859aae75fd9d246c409b10a6bd137 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Tue, 29 Nov 2016 18:09:01 +0800
+Subject: xfrm_user: fix return value from xfrm_user_rcv_msg
+
+From: Yi Zhao <yi.zhao@windriver.com>
+
+commit 83e2d0587ae859aae75fd9d246c409b10a6bd137 upstream.
+
+It doesn't support to run 32bit 'ip' to set xfrm objdect on 64bit host.
+But the return value is unknown for user program:
+
+ip xfrm policy list
+RTNETLINK answers: Unknown error 524
+
+Replace ENOTSUPP with EOPNOTSUPP:
+
+ip xfrm policy list
+RTNETLINK answers: Operation not supported
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
+Signed-off-by: Nathan Harold <nharold@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/xfrm/xfrm_user.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/xfrm/xfrm_user.c
++++ b/net/xfrm/xfrm_user.c
+@@ -2480,7 +2480,7 @@ static int xfrm_user_rcv_msg(struct sk_b
+ 
+ #ifdef CONFIG_COMPAT
+       if (is_compat_task())
+-              return -ENOTSUPP;
++              return -EOPNOTSUPP;
+ #endif
+ 
+       type = nlh->nlmsg_type;