[kernel] r18055 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Tue Sep  6 13:47:03 2011
New Revision: 18055

Log:
devpts: correctly check d_alloc_name() return code (Closes: #640650)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/fs-devpts-inode.c-correctly-check-d_alloc_name-retur.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/36

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Tue Sep  6 03:21:11 2011	(r18054)
+++ dists/squeeze/linux-2.6/debian/changelog	Tue Sep  6 13:47:03 2011	(r18055)
@@ -90,6 +90,7 @@
   * Fix bugs in IPv6 forwarding with GRO/GSO (Closes: #630730):
     - e1000e,igb,igbvf,ixgbe: Fix IPv6 GSO type checks
     - ipv6: Add GSO support on forwarding path
+  * devpts: correctly check d_alloc_name() return code (Closes: #640650)
 
  -- maximilian attems <maks at debian.org>  Sat, 25 Jun 2011 10:22:27 +0200
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/fs-devpts-inode.c-correctly-check-d_alloc_name-retur.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/fs-devpts-inode.c-correctly-check-d_alloc_name-retur.patch	Tue Sep  6 13:47:03 2011	(r18055)
@@ -0,0 +1,35 @@
+From: Andrey Vagin <avagin at openvz.org>
+Date: Tue, 22 Mar 2011 16:35:11 -0700
+Subject: [PATCH] fs/devpts/inode.c: correctly check d_alloc_name() return
+ code in devpts_pty_new()
+
+commit b12d12596992f608f5506a8dabe4d1299594bd1e upstream.
+
+d_alloc_name return NULL in case error, but we expect errno in
+devpts_pty_new.
+
+Addresses http://bugzilla.openvz.org/show_bug.cgi?id=1758
+
+Signed-off-by: Andrey Vagin <avagin at openvz.org>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ fs/devpts/inode.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
+index c6bd815..2f27e57 100644
+--- a/fs/devpts/inode.c
++++ b/fs/devpts/inode.c
+@@ -502,7 +502,7 @@ int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty)
+ 	mutex_lock(&root->d_inode->i_mutex);
+ 
+ 	dentry = d_alloc_name(root, s);
+-	if (!IS_ERR(dentry)) {
++	if (dentry) {
+ 		d_add(dentry, inode);
+ 		fsnotify_create(root->d_inode, dentry);
+ 	} else {
+-- 
+1.7.5.4
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/36
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/36	Tue Sep  6 03:21:11 2011	(r18054)
+++ dists/squeeze/linux-2.6/debian/patches/series/36	Tue Sep  6 13:47:03 2011	(r18055)
@@ -685,3 +685,4 @@
 + bugfix/all/atm-br2864-sent-packets-truncated-in-VC-routed-mode.patch
 + bugfix/all/sched-work-around-sched_group-cpu_power-0.patch
 + bugfix/x86/revert-x86-hotplug-Use-mwait-to-offline-a-processor-.patch
++ bugfix/all/fs-devpts-inode.c-correctly-check-d_alloc_name-retur.patch