[linux] 01/01: unix: Fix ABI change for CVE-2013-4312

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch squeeze-security
in repository linux.

commit 7f0ae8ff0caba9a8d91e3d0dfde2f998b8643cde
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Jan 17 17:14:19 2016 +0000

    unix: Fix ABI change for CVE-2013-4312
---
 ...unix-fix-abi-change-for-cve-2013-4312-fix.patch | 33 ++++++++++++++++++++++
 debian/patches/series/48squeeze19                  |  1 +
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/debian/unix-fix-abi-change-for-cve-2013-4312-fix.patch b/debian/patches/debian/unix-fix-abi-change-for-cve-2013-4312-fix.patch
new file mode 100644
index 0000000..6c8a376
--- /dev/null
+++ b/debian/patches/debian/unix-fix-abi-change-for-cve-2013-4312-fix.patch
@@ -0,0 +1,33 @@
+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
+Forwarded: not-needed
+
+The fix for CVE-2013-4312 added a new structure member,
+user_struct::unix_inflight.  As this is always allocated in
+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.
+
+---
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -724,7 +724,6 @@ struct user_struct {
+ 	unsigned long mq_bytes;	/* How many bytes can be allocated to mqueue? */
+ #endif
+ 	unsigned long locked_shm; /* How many pages of mlocked shm ? */
+-	unsigned long unix_inflight;	/* How many files in flight in unix sockets */
+ 
+ #ifdef CONFIG_KEYS
+ 	struct key *uid_keyring;	/* UID specific keyring */
+@@ -739,6 +738,10 @@ struct user_struct {
+ #ifdef CONFIG_PERF_EVENTS
+ 	atomic_long_t locked_vm;
+ #endif
++
++#ifndef __GENKSYMS__
++	unsigned long unix_inflight;	/* How many files in flight in unix sockets */
++#endif
+ };
+ 
+ extern int uids_sysfs_init(void);
diff --git a/debian/patches/series/48squeeze19 b/debian/patches/series/48squeeze19
index 148472f..5f4b678 100644
--- a/debian/patches/series/48squeeze19
+++ b/debian/patches/series/48squeeze19
@@ -2,3 +2,4 @@
 + bugfix/all/sctp-prevent-soft-lockup-when-sctp_accept-is-called-.patch
 + bugfix/all/tty-fix-unsafe-ldisc-reference-via-ioctl-tiocgetd.patch
 + bugfix/all/unix-properly-account-for-FDs-passed-over-unix-socke.patch
++ debian/unix-fix-abi-change-for-cve-2013-4312-fix.patch

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