[kernel] r22464 - in dists/wheezy/linux/debian: . patches patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Tue Mar 31 03:27:45 2015
New Revision: 22464

Log:
NFSv4: Fix oops in nfs4_handle_exception when server returns NFS4ERR_OPENMODE (Closes: #731439)

Added:
   dists/wheezy/linux/debian/patches/bugfix/all/nfsv4-minor-cleanups-for-nfs4_handle_exception-and-n.patch
Modified:
   dists/wheezy/linux/debian/changelog
   dists/wheezy/linux/debian/patches/series

Modified: dists/wheezy/linux/debian/changelog
==============================================================================
--- dists/wheezy/linux/debian/changelog	Tue Mar 31 03:20:39 2015	(r22463)
+++ dists/wheezy/linux/debian/changelog	Tue Mar 31 03:27:45 2015	(r22464)
@@ -79,6 +79,8 @@
     - drm/radeon: add missing crtc unlock when setting up the MC
   * [rt] Update to 3.2.68-rt98
   * hpsa: Update device ID tables (Closes: #781548)
+  * NFSv4: Fix oops in nfs4_handle_exception when server returns
+    NFS4ERR_OPENMODE (Closes: #731439)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 23 Feb 2015 03:42:59 +0000
 

Added: dists/wheezy/linux/debian/patches/bugfix/all/nfsv4-minor-cleanups-for-nfs4_handle_exception-and-n.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/bugfix/all/nfsv4-minor-cleanups-for-nfs4_handle_exception-and-n.patch	Tue Mar 31 03:27:45 2015	(r22464)
@@ -0,0 +1,47 @@
+From: Trond Myklebust <Trond.Myklebust at netapp.com>
+Date: Tue, 27 Mar 2012 18:31:25 -0400
+Subject: NFSv4: Minor cleanups for nfs4_handle_exception and
+ nfs4_async_handle_error
+Origin: https://git.kernel.org/linus/14977489ffdb80d4caf5a184ba41b23b02fbacd9
+Bug-Debian: https://bugs.debian.org/731439
+
+Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>
+---
+ fs/nfs/nfs4proc.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -267,7 +267,7 @@ static int nfs4_handle_exception(struct
+ 		case 0:
+ 			return 0;
+ 		case -NFS4ERR_OPENMODE:
+-			if (nfs_have_delegation(inode, FMODE_READ)) {
++			if (inode && nfs_have_delegation(inode, FMODE_READ)) {
+ 				nfs_inode_return_delegation(inode);
+ 				exception->retry = 1;
+ 				return 0;
+@@ -279,10 +279,9 @@ static int nfs4_handle_exception(struct
+ 		case -NFS4ERR_DELEG_REVOKED:
+ 		case -NFS4ERR_ADMIN_REVOKED:
+ 		case -NFS4ERR_BAD_STATEID:
+-			if (state != NULL)
+-				nfs_remove_bad_delegation(state->inode);
+ 			if (state == NULL)
+ 				break;
++			nfs_remove_bad_delegation(state->inode);
+ 			nfs4_schedule_stateid_recovery(server, state);
+ 			goto wait_on_recovery;
+ 		case -NFS4ERR_EXPIRED:
+@@ -3746,8 +3745,9 @@ nfs4_async_handle_error(struct rpc_task
+ 		case -NFS4ERR_DELEG_REVOKED:
+ 		case -NFS4ERR_ADMIN_REVOKED:
+ 		case -NFS4ERR_BAD_STATEID:
+-			if (state != NULL)
+-				nfs_remove_bad_delegation(state->inode);
++			if (state == NULL)
++				break;
++			nfs_remove_bad_delegation(state->inode);
+ 		case -NFS4ERR_OPENMODE:
+ 			if (state == NULL)
+ 				break;

Modified: dists/wheezy/linux/debian/patches/series
==============================================================================
--- dists/wheezy/linux/debian/patches/series	Tue Mar 31 03:20:39 2015	(r22463)
+++ dists/wheezy/linux/debian/patches/series	Tue Mar 31 03:27:45 2015	(r22464)
@@ -1153,3 +1153,5 @@
 features/all/hpsa/0009-hpsa-fix-a-couple-pci-id-table-mistakes.patch
 features/all/hpsa/0010-hpsa-add-in-gen9-controller-model-names.patch
 features/all/hpsa/0011-hpsa-add-in-P840ar-controller-model-name.patch
+
+bugfix/all/nfsv4-minor-cleanups-for-nfs4_handle_exception-and-n.patch