[kernel] r13186 - in dists/lenny/linux-2.6/debian: . patches/features/all/openvz patches/series

[Dann Frazier]

Author: dannf
Date: Fri Mar 20 19:05:18 2009
New Revision: 13186

Log:
[openvz] simfs: fix oops if filesystem passes NULL mnt arg to
getattr. (Closes: #508773)

Added:
   dists/lenny/linux-2.6/debian/patches/features/all/openvz/simfs-getatts-fix-oops-on-NULL-mnt.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/14-extra

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	(original)
+++ dists/lenny/linux-2.6/debian/changelog	Fri Mar 20 19:05:18 2009
@@ -26,6 +26,8 @@
     a ve start (Closes: #511165)
   * [openvz] CPT: revert check on sk_reuse>1 (Closes: #500645)
   * Fixes for CVE-2009-0029 broke uml compilation; fix.
+  * [openvz] simfs: fix oops if filesystem passes NULL mnt arg to
+    getattr. (Closes: #508773)
 
   [ Martin Michlmayr ]
   * rt2x00: Fix VGC lower bound initialization. (Closes: #510607)
@@ -64,7 +66,7 @@
     context only
   * [openvz] 4909102 netfilter: call nf_register_hooks from VE0 context only.
 
- -- dann frazier <dannf at debian.org>  Fri, 20 Mar 2009 09:57:59 -0600
+ -- dann frazier <dannf at debian.org>  Fri, 20 Mar 2009 13:02:09 -0600
 
 linux-2.6 (2.6.26-13lenny2) stable-security; urgency=high
 

Added: dists/lenny/linux-2.6/debian/patches/features/all/openvz/simfs-getatts-fix-oops-on-NULL-mnt.patch
==============================================================================
--- (empty file)
+++ dists/lenny/linux-2.6/debian/patches/features/all/openvz/simfs-getatts-fix-oops-on-NULL-mnt.patch	Fri Mar 20 19:05:18 2009
@@ -0,0 +1,32 @@
+From: Konstantin Khlebnikov <khlebnikov at openvz.org>
+Date: Tue, 3 Feb 2009 10:57:32 +0000 (+0300)
+Subject: simfs: don't work with buggy input
+X-Git-Tag: v2.6.24-ovz008~2
+X-Git-Url: http://git.openvz.org/?p=linux-2.6.24-openvz;a=commitdiff_plain;h=20bd90762d4df4a3c7c247b660c696bdd0a27709
+
+simfs: don't work with buggy input
+
+Some (buggy) filesystems (aufs for example) pass NULL as mnt to getatts
+and hope for the better...
+
+Let's not confuse the user with the oops at least.
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1054
+
+Signed-off-by: Konstantin Khlebnikov <khlebnikov at openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
+---
+
+diff --git a/fs/simfs.c b/fs/simfs.c
+index d533af4..3d74fb8 100644
+--- a/fs/simfs.c
++++ b/fs/simfs.c
+@@ -55,6 +55,8 @@ static int sim_getattr(struct vfsmount *mnt, struct dentry *dentry,
+ 			return err;
+ 	}
+ 
++	if (!mnt)
++		return 0;
+ 	sb = mnt->mnt_sb;
+ 	if (sb->s_op == &sim_super_ops)
+ 		stat->dev = sb->s_dev;

Modified: dists/lenny/linux-2.6/debian/patches/series/14-extra
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/14-extra	(original)
+++ dists/lenny/linux-2.6/debian/patches/series/14-extra	Fri Mar 20 19:05:18 2009
@@ -10,3 +10,4 @@
 + features/all/openvz/0029-conntrack-adjust-context-during-freeing.patch featureset=openvz
 + features/all/openvz/0033-netfilter-NAT-assign-nf_nat_seq_adjust_hook-from-V.patch featureset=openvz
 + features/all/openvz/0034-netfilter-call-nf_register_hooks-from-VE0-context-o.patch featureset=openvz
++ features/all/openvz/simfs-getatts-fix-oops-on-NULL-mnt.patch featureset=openvz