[linux] 01/01: Fix yet another ABI change due to CVE-2013-4312 mitigation

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit af8b80ce07387b9b856e577029f2bb0f810388ed
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Feb 6 23:25:02 2016 +0000

    Fix yet another ABI change due to CVE-2013-4312 mitigation
---
 ...patch => fix-abi-changes-for-cve-2013-4312-fix.patch} | 16 +++++++++++++++-
 debian/patches/series                                    |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/patches/bugfix/all/user_struct-fix-abi-change-for-cve-2013-4312-fix.patch b/debian/patches/bugfix/all/fix-abi-changes-for-cve-2013-4312-fix.patch
similarity index 77%
rename from debian/patches/bugfix/all/user_struct-fix-abi-change-for-cve-2013-4312-fix.patch
rename to debian/patches/bugfix/all/fix-abi-changes-for-cve-2013-4312-fix.patch
index cc71768..779d0a4 100644
--- a/debian/patches/bugfix/all/user_struct-fix-abi-change-for-cve-2013-4312-fix.patch
+++ b/debian/patches/bugfix/all/fix-abi-changes-for-cve-2013-4312-fix.patch
@@ -1,6 +1,6 @@
 From: Ben Hutchings <ben at decadent.org.uk>
 Date: Sun, 17 Jan 2016 15:55:02 +0000
-Subject: unix: Fix ABI change for CVE-2013-4312
+Subject: Fix ABI changes for CVE-2013-4312
 Forwarded: not-needed
 
 The fixes for CVE-2013-4312 added new structure members,
@@ -9,6 +9,8 @@ kernel/user.c and the new member is only used by af_unix which is also
 built-in, we can safely add new members at the end.  So move it to the
 end and hide it from genksyms.
 
+Similarly for pipe_inode_info::user.
+
 ---
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
@@ -33,3 +35,15 @@ end and hide it from genksyms.
  };
  
  extern int uids_sysfs_init(void);
+--- a/include/linux/pipe_fs_i.h
++++ b/include/linux/pipe_fs_i.h
+@@ -58,7 +58,9 @@ struct pipe_inode_info {
+ 	struct fasync_struct *fasync_readers;
+ 	struct fasync_struct *fasync_writers;
+ 	struct pipe_buffer *bufs;
++#ifndef __GENKSYMS__
+ 	struct user_struct *user;
++#endif
+ };
+ 
+ /*
diff --git a/debian/patches/series b/debian/patches/series
index b53c5d4..48392ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -140,5 +140,5 @@ bugfix/all/netfilter-nf_nat_redirect-add-missing-NULL-pointer-c.patch
 debian/usb-fix-abi-change-in-4.3.5.patch
 bugfix/all/rt2x00-fix-monitor-mode-regression.patch
 bugfix/all/pipe-limit-the-per-user-amount-of-pages-allocated-in.patch
-bugfix/all/user_struct-fix-abi-change-for-cve-2013-4312-fix.patch
+bugfix/all/fix-abi-changes-for-cve-2013-4312-fix.patch
 features/sparc/hwrng-n2-attach-on-t5-m5-t7-m7-sparc-cpus.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git