diff options
| -rw-r--r-- | NFSv3-Fix-another-acl-regression.patch | 37 | ||||
| -rw-r--r-- | kernel.spec | 9 |
2 files changed, 46 insertions, 0 deletions
diff --git a/NFSv3-Fix-another-acl-regression.patch b/NFSv3-Fix-another-acl-regression.patch new file mode 100644 index 000000000..af3af2a66 --- /dev/null +++ b/NFSv3-Fix-another-acl-regression.patch @@ -0,0 +1,37 @@ +From 498a0fb58f119bfa222065fc4f2932e81e1510ed Mon Sep 17 00:00:00 2001 +From: Trond Myklebust <trond.myklebust@primarydata.com> +Date: Sun, 24 Aug 2014 14:46:48 -0400 +Subject: [PATCH] NFSv3: Fix another acl regression + +When creating a new object on the NFS server, we should not be sending +posix setacl requests unless the preceding posix_acl_create returned a +non-trivial acl. Doing so, causes Solaris servers in particular to +return an EINVAL. + +Fixes: 013cdf1088d72 (nfs: use generic posix ACL infrastructure,,,) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1132786 +Cc: stable@vger.kernel.org # 3.14+ +Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> +--- + fs/nfs/nfs3acl.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c +index d0fec260132a..24c6898159cc 100644 +--- a/fs/nfs/nfs3acl.c ++++ b/fs/nfs/nfs3acl.c +@@ -129,7 +129,10 @@ static int __nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl, + .rpc_argp = &args, + .rpc_resp = &fattr, + }; +- int status; ++ int status = 0; ++ ++ if (acl == NULL && (!S_ISDIR(inode->i_mode) || dfacl == NULL)) ++ goto out; + + status = -EOPNOTSUPP; + if (!nfs_server_capable(inode, NFS_CAP_ACLS)) +-- +1.9.3 + diff --git a/kernel.spec b/kernel.spec index 60953a02f..5c7b1769c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -654,6 +654,9 @@ Patch26015: nfs-fix-kernel-warning-when-removing-proc-entry.patch #rhbz 1132666 Patch26016: xhci-Disable-streams-on-Via-XHCI-with-device-id-0x34.patch +#rhbz 1132786 +Patch26018: NFSv3-Fix-another-acl-regression.patch + # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel Patch30000: kernel-arm64.patch @@ -1393,6 +1396,9 @@ ApplyPatch nfs-fix-kernel-warning-when-removing-proc-entry.patch #rhbz 1132666 ApplyPatch xhci-Disable-streams-on-Via-XHCI-with-device-id-0x34.patch +#rhbz 1132786 +ApplyPatch NFSv3-Fix-another-acl-regression.patch + %if 0%{?aarch64patches} ApplyPatch kernel-arm64.patch %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does. @@ -2275,6 +2281,9 @@ fi # ||----w | # || || %changelog +* Thu Aug 28 2014 Josh Boyer <jwboyer@fedoraproject.org> +- Fix NFSv3 ACL regression (rhbz 1132786) + * Thu Aug 28 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc2.git2.1 - Linux v3.17-rc2-42-gf1bd473f95e0 - Don't enable CONFIG_DEBUG_WW_MUTEX_SLOWPATH (rhbz 1114160) |