summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2021-01-28 17:36:38 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-30 14:44:59 +0200
commit2bb5ec7f5556a91612f1857c9a1b1eb832a1f8c7 (patch)
treec67e1e8c60f6299bc7a2f14c28015e4b6cb7b1e8 /fs
parent38a3fce79a8335ada89afbb86f1787c3769a6bbe (diff)
downloadlinux-stable-2bb5ec7f5556a91612f1857c9a1b1eb832a1f8c7.tar.gz
linux-stable-2bb5ec7f5556a91612f1857c9a1b1eb832a1f8c7.tar.bz2
linux-stable-2bb5ec7f5556a91612f1857c9a1b1eb832a1f8c7.zip
nfs: we don't support removing system.nfs4_acl
[ Upstream commit 4f8be1f53bf615102d103c0509ffa9596f65b718 ] The NFSv4 protocol doesn't have any notion of reomoving an attribute, so removexattr(path,"system.nfs4_acl") doesn't make sense. There's no documented return value. Arguably it could be EOPNOTSUPP but I'm a little worried an application might take that to mean that we don't support ACLs or xattrs. How about EINVAL? Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4proc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 0c9386978d9d..92ca753723b5 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4848,6 +4848,9 @@ static int __nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t bufl
unsigned int npages = DIV_ROUND_UP(buflen, PAGE_SIZE);
int ret, i;
+ /* You can't remove system.nfs4_acl: */
+ if (buflen == 0)
+ return -EINVAL;
if (!nfs4_server_supports_acls(server))
return -EOPNOTSUPP;
if (npages > ARRAY_SIZE(pages))