Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1244272
| From | Andreas Gruenbacher <andreas.gruenbacher@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v10 33/46] nfsd: Keep list of acls to dispose of in compoundargs |
| Date | 2015-10-12 01:10 +0200 |
| Message-ID | <qixUD-61y-57@gated-at.bofh.it> (permalink) |
| References | <qixKV-5z8-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Andreas Gruenbacher <agruenba@redhat.com>
We will decode acls in requests into richacls. Even if unlikely, there
can be more than one acl in a single request; those richacls need to be
richacl_put() at the end of the request instead of kfree()d, so keep a
list of acls in compoundargs for that.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Acked-by: J. Bruce Fields <bfields@redhat.com>
---
fs/nfsd/nfs4xdr.c | 27 +++++++++++++++++++++++++++
fs/nfsd/xdr4.h | 6 ++++++
2 files changed, 33 insertions(+)
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 51c9e9c..b8db5a7 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -40,6 +40,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
#include <linux/sunrpc/svcauth_gss.h>
+#include <linux/richacl.h>
#include "idmap.h"
#include "acl.h"
@@ -196,6 +197,24 @@ svcxdr_tmpalloc(struct nfsd4_compoundargs *argp, u32 len)
return tb->buf;
}
+static struct richacl *
+svcxdr_alloc_richacl(struct nfsd4_compoundargs *argp, u32 nace)
+{
+ struct svcxdr_richacl *acls;
+
+ acls = kmalloc(sizeof(*acls), GFP_KERNEL);
+ if (!acls)
+ return NULL;
+ acls->acl = richacl_alloc(nace, GFP_KERNEL);
+ if (!acls->acl) {
+ kfree(acls);
+ return NULL;
+ }
+ acls->next = argp->acls;
+ argp->acls = acls;
+ return acls->acl;
+}
+
/*
* For xdr strings that need to be passed to other kernel api's
* as null-terminated strings.
@@ -4437,6 +4456,13 @@ int nfsd4_release_compoundargs(void *rq, __be32 *p, void *resp)
args->to_free = tb->next;
kfree(tb);
}
+ while (args->acls) {
+ struct svcxdr_richacl *acls = args->acls;
+
+ args->acls = acls->next;
+ richacl_put(acls->acl);
+ kfree(acls);
+ }
return 1;
}
@@ -4455,6 +4481,7 @@ nfs4svc_decode_compoundargs(struct svc_rqst *rqstp, __be32 *p, struct nfsd4_comp
args->pagelen = rqstp->rq_arg.page_len;
args->tmpp = NULL;
args->to_free = NULL;
+ args->acls = NULL;
args->ops = args->iops;
args->rqstp = rqstp;
diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index 9f99100..b698585 100644
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -570,6 +570,11 @@ struct svcxdr_tmpbuf {
char buf[];
};
+struct svcxdr_richacl {
+ struct svcxdr_richacl *next;
+ struct richacl *acl;
+};
+
struct nfsd4_compoundargs {
/* scratch variables for XDR decode */
__be32 * p;
@@ -579,6 +584,7 @@ struct nfsd4_compoundargs {
__be32 tmp[8];
__be32 * tmpp;
struct svcxdr_tmpbuf *to_free;
+ struct svcxdr_richacl *acls;
struct svc_rqst *rqstp;
--
2.5.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v10 00/46] Richacls Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:00 +0200
[PATCH v10 37/46] nfsd: Add support for the MAY_CREATE_{FILE,DIR} permissions Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 35/46] nfsd: Add richacl support Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 27/46] richacl: Propagate everyone@ permissions to other aces Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 17/46] richacl: xattr mapping functions Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 23/46] xfs: Make xfs_set_mode non-static Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
Re: [PATCH v10 23/46] xfs: Make xfs_set_mode non-static Dave Chinner <david@fromorbit.com> - 2015-10-12 01:50 +0200
[PATCH v10 43/46] nfs: Remove unused xdr page offsets in getacl/setacl arguments Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 24/46] xfs: Add richacl support Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
Re: [PATCH v10 24/46] xfs: Add richacl support Dave Chinner <david@fromorbit.com> - 2015-10-12 02:20 +0200
Re: [PATCH v10 24/46] xfs: Add richacl support Andreas Grünbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 04:00 +0200
Re: [PATCH v10 24/46] xfs: Add richacl support Dave Chinner <david@fromorbit.com> - 2015-10-12 06:10 +0200
Re: [PATCH v10 24/46] xfs: Add richacl support Andreas Gruenbacher <agruenba@redhat.com> - 2015-10-12 08:00 +0200
Re: [PATCH v10 24/46] xfs: Add richacl support Austin S Hemmelgarn <ahferroin7@gmail.com> - 2015-10-13 21:30 +0200
Re: [PATCH v10 24/46] xfs: Add richacl support Andreas Gruenbacher <agruenba@redhat.com> - 2015-10-13 15:40 +0200
[PATCH v10 28/46] richacl: Set the owner permissions to the owner mask Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 30/46] richacl: Isolate the owner and group classes Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 19/46] vfs: Add richacl permission checking Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 26/46] richacl: Move everyone@ aces down the acl Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 18/46] richacl: Add richacl xattr handler Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 42/46] nfs: Fix GETATTR bitmap verification Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 36/46] nfsd: Add support for the v4.1 dacl attribute Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 13/46] richacl: Update the file masks in chmod() Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 32/46] richacl: Create richacl from mode values Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 22/46] xfs: Fix error path in xfs_get_acl Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 20/46] ext4: Add richacl support Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 11/46] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 14/46] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 33/46] nfsd: Keep list of acls to dispose of in compoundargs Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 38/46] richacl: Add support for unmapped identifiers Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
Re: [PATCH v10 38/46] richacl: Add support for unmapped identifiers Dave Chinner <david@fromorbit.com> - 2015-10-12 02:30 +0200
Re: [PATCH v10 38/46] richacl: Add support for unmapped identifiers Andreas Grünbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 04:00 +0200
[PATCH v10 29/46] richacl: Set the other permissions to the other mask Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 45/46] nfs: Add support for the v4.1 dacl attribute Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 41/46] sunrpc: Add xdr_init_encode_pages Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 46/46] richacl: uapi header split Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 44/46] nfs: Add richacl support Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
Re: [PATCH v10 44/46] nfs: Add richacl support Anna Schumaker <Anna.Schumaker@netapp.com> - 2015-10-12 16:40 +0200
Re: [PATCH v10 44/46] nfs: Add richacl support Andreas Gruenbacher <agruenba@redhat.com> - 2015-10-12 21:50 +0200
[PATCH v10 21/46] ext4: Add richacl feature flag Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 25/46] richacl: acl editing helper functions Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 15/46] richacl: Create-time inheritance Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 31/46] richacl: Apply the file masks to a richacl Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 40/46] sunrpc: Allow to demand-allocate pages to encode into Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:20 +0200
[PATCH v10 39/46] ext4: Don't allow unmapped identifiers in richacls Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:20 +0200
[PATCH v10 34/46] nfsd: Use richacls as internal acl representation Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:20 +0200
[PATCH v10 16/46] richacl: Automatic Inheritance Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:30 +0200
[PATCH v10 03/46] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD permission flags Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 12/46] vfs: Cache richacl in struct inode Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 09/46] richacl: Permission check algorithm Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 10/46] vfs: Cache base_acl objects in inodes Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 08/46] richacl: Compute maximum file masks from an acl Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 04/46] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 05/46] vfs: Add permission flags for setting file attributes Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 02/46] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 01/46] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:50 +0200
[PATCH v10 07/46] richacl: Permission mapping functions Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:50 +0200
[PATCH v10 06/46] richacl: In-memory representation and helper functions Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:50 +0200
csiph-web