[linux] 01/01: [vserver] vfs: Fix missing return value in follow_dotdot() after fix for CVE-2015-2925

[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 5f2df353c31b184da11eafa022943112bb440970
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Oct 11 19:50:56 2015 +0100

    [vserver] vfs: Fix missing return value in follow_dotdot() after fix for CVE-2015-2925
---
 debian/changelog                                          | 7 +++++++
 debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4e00e7a..0862bed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.32-48squeeze16) squeeze-lts; urgency=medium
+
+  * [vserver] vfs: Fix missing return value in follow_dotdot() after fix for
+    CVE-2015-2925
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 11 Oct 2015 19:49:42 +0100
+
 linux-2.6 (2.6.32-48squeeze15) squeeze-lts; urgency=medium
 
   * USB: whiteheat: fix potential null-deref at probe (CVE-2015-5257)
diff --git a/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch b/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch
index 52a5542..2b0137b 100644
--- a/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch
+++ b/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch
@@ -7,6 +7,7 @@
  'inet: prevent leakage of uninitialized memory to user in recv syscalls']
 [bwh: Fix context for changes to do_anonymous_page() in 2.6.32.68]
 [bwh: Fix context for changes in ipc/sem.c for fixes for CVE-2015-7613]
+[bwh: Fix added return statement in follow_dotdot() after fix for CVE-2015-2925]
 
 --- a/Documentation/scheduler/sched-cfs-hard-limits.txt	1970-01-01 01:00:00.000000000 +0100
 +++ a/Documentation/scheduler/sched-cfs-hard-limits.txt	2011-06-10 13:03:02.000000000 +0200
@@ -4854,7 +4855,7 @@
  		    nd->path.mnt == nd->root.mnt) {
 -			break;
 +			/* for sane '/' avoid follow_mount() */
-+			return;
++			return 0;
  		}
  		spin_lock(&dcache_lock);
  		if (nd->path.dentry != nd->path.mnt->mnt_root) {

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