Merge tag 'nfs-for-5.7-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

torvalds · torvalds · commit 50bda5faa625 · 2020-04-12T09:39:47.000-07:00
Pull NFS client bugfix from Trond Myklebust:
 "Fix an RCU read lock leakage in pnfs_alloc_ds_commits_list()"

* tag 'nfs-for-5.7-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  pNFS: Fix RCU lock leakage
diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c
@@ -501,6 +501,7 @@ pnfs_alloc_ds_commits_list(struct list_head *list,
 		rcu_read_lock();
 		pnfs_put_commit_array(array, cinfo->inode);
 	}
+	rcu_read_unlock();
 	return ret;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -501,6 +501,7 @@ pnfs_alloc_ds_commits_list(struct list_head *list,`
`501`	`501`	`rcu_read_lock();`
`502`	`502`	`pnfs_put_commit_array(array, cinfo->inode);`
`503`	`503`	`}`
	`504`	`+ rcu_read_unlock();`
`504`	`505`	`return ret;`
`505`	`506`	`}`
`506`	`507`