Skip to content

Commit 64e178a

Browse files
Christoph HellwigAl Viro
Christoph Hellwig
authored and
Al Viro
committed
ext2/3/4: use generic posix ACL infrastructure
Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 996a710 commit 64e178a

File tree

21 files changed

+100
-605
lines changed

21 files changed

+100
-605
lines changed

‎fs/ext2/acl.c

Lines changed: 14 additions & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,6 @@ ext2_get_acl(struct inode *inode, int type)
148148
struct posix_acl *acl;
149149
int retval;
150150

151-
if (!test_opt(inode->i_sb, POSIX_ACL))
152-
return NULL;
153-
154-
acl = get_cached_acl(inode, type);
155-
if (acl != ACL_NOT_CACHED)
156-
return acl;
157-
158151
switch (type) {
159152
case ACL_TYPE_ACCESS:
160153
name_index = EXT2_XATTR_INDEX_POSIX_ACL_ACCESS;
@@ -189,19 +182,14 @@ ext2_get_acl(struct inode *inode, int type)
189182
/*
190183
* inode->i_mutex: down
191184
*/
192-
static int
193-
ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
185+
int
186+
ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
194187
{
195188
int name_index;
196189
void *value = NULL;
197190
size_t size = 0;
198191
int error;
199192

200-
if (S_ISLNK(inode->i_mode))
201-
return -EOPNOTSUPP;
202-
if (!test_opt(inode->i_sb, POSIX_ACL))
203-
return 0;
204-
205193
switch(type) {
206194
case ACL_TYPE_ACCESS:
207195
name_index = EXT2_XATTR_INDEX_POSIX_ACL_ACCESS;
@@ -250,169 +238,21 @@ ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
250238
int
251239
ext2_init_acl(struct inode *inode, struct inode *dir)
252240
{
253-
struct posix_acl *acl = NULL;
254-
int error = 0;
255-
256-
if (!S_ISLNK(inode->i_mode)) {
257-
if (test_opt(dir->i_sb, POSIX_ACL)) {
258-
acl = ext2_get_acl(dir, ACL_TYPE_DEFAULT);
259-
if (IS_ERR(acl))
260-
return PTR_ERR(acl);
261-
}
262-
if (!acl)
263-
inode->i_mode &= ~current_umask();
264-
}
265-
if (test_opt(inode->i_sb, POSIX_ACL) && acl) {
266-
if (S_ISDIR(inode->i_mode)) {
267-
error = ext2_set_acl(inode, ACL_TYPE_DEFAULT, acl);
268-
if (error)
269-
goto cleanup;
270-
}
271-
error = __posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode);
272-
if (error < 0)
273-
return error;
274-
if (error > 0) {
275-
/* This is an extended ACL */
276-
error = ext2_set_acl(inode, ACL_TYPE_ACCESS, acl);
277-
}
278-
}
279-
cleanup:
280-
posix_acl_release(acl);
281-
return error;
282-
}
283-
284-
/*
285-
* Does chmod for an inode that may have an Access Control List. The
286-
* inode->i_mode field must be updated to the desired value by the caller
287-
* before calling this function.
288-
* Returns 0 on success, or a negative error number.
289-
*
290-
* We change the ACL rather than storing some ACL entries in the file
291-
* mode permission bits (which would be more efficient), because that
292-
* would break once additional permissions (like ACL_APPEND, ACL_DELETE
293-
* for directories) are added. There are no more bits available in the
294-
* file mode.
295-
*
296-
* inode->i_mutex: down
297-
*/
298-
int
299-
ext2_acl_chmod(struct inode *inode)
300-
{
301-
struct posix_acl *acl;
302-
int error;
241+
struct posix_acl *default_acl, *acl;
242+
int error;
303243

304-
if (!test_opt(inode->i_sb, POSIX_ACL))
305-
return 0;
306-
if (S_ISLNK(inode->i_mode))
307-
return -EOPNOTSUPP;
308-
acl = ext2_get_acl(inode, ACL_TYPE_ACCESS);
309-
if (IS_ERR(acl) || !acl)
310-
return PTR_ERR(acl);
311-
error = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
244+
error = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl);
312245
if (error)
313246
return error;
314-
error = ext2_set_acl(inode, ACL_TYPE_ACCESS, acl);
315-
posix_acl_release(acl);
316-
return error;
317-
}
318247

319-
/*
320-
* Extended attribut handlers
321-
*/
322-
static size_t
323-
ext2_xattr_list_acl_access(struct dentry *dentry, char *list, size_t list_size,
324-
const char *name, size_t name_len, int type)
325-
{
326-
const size_t size = sizeof(POSIX_ACL_XATTR_ACCESS);
327-
328-
if (!test_opt(dentry->d_sb, POSIX_ACL))
329-
return 0;
330-
if (list && size <= list_size)
331-
memcpy(list, POSIX_ACL_XATTR_ACCESS, size);
332-
return size;
333-
}
334-
335-
static size_t
336-
ext2_xattr_list_acl_default(struct dentry *dentry, char *list, size_t list_size,
337-
const char *name, size_t name_len, int type)
338-
{
339-
const size_t size = sizeof(POSIX_ACL_XATTR_DEFAULT);
340-
341-
if (!test_opt(dentry->d_sb, POSIX_ACL))
342-
return 0;
343-
if (list && size <= list_size)
344-
memcpy(list, POSIX_ACL_XATTR_DEFAULT, size);
345-
return size;
346-
}
347-
348-
static int
349-
ext2_xattr_get_acl(struct dentry *dentry, const char *name, void *buffer,
350-
size_t size, int type)
351-
{
352-
struct posix_acl *acl;
353-
int error;
354-
355-
if (strcmp(name, "") != 0)
356-
return -EINVAL;
357-
if (!test_opt(dentry->d_sb, POSIX_ACL))
358-
return -EOPNOTSUPP;
359-
360-
acl = ext2_get_acl(dentry->d_inode, type);
361-
if (IS_ERR(acl))
362-
return PTR_ERR(acl);
363-
if (acl == NULL)
364-
return -ENODATA;
365-
error = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);
366-
posix_acl_release(acl);
367-
368-
return error;
369-
}
370-
371-
static int
372-
ext2_xattr_set_acl(struct dentry *dentry, const char *name, const void *value,
373-
size_t size, int flags, int type)
374-
{
375-
struct posix_acl *acl;
376-
int error;
377-
378-
if (strcmp(name, "") != 0)
379-
return -EINVAL;
380-
if (!test_opt(dentry->d_sb, POSIX_ACL))
381-
return -EOPNOTSUPP;
382-
if (!inode_owner_or_capable(dentry->d_inode))
383-
return -EPERM;
384-
385-
if (value) {
386-
acl = posix_acl_from_xattr(&init_user_ns, value, size);
387-
if (IS_ERR(acl))
388-
return PTR_ERR(acl);
389-
else if (acl) {
390-
error = posix_acl_valid(acl);
391-
if (error)
392-
goto release_and_out;
393-
}
394-
} else
395-
acl = NULL;
396-
397-
error = ext2_set_acl(dentry->d_inode, type, acl);
398-
399-
release_and_out:
400-
posix_acl_release(acl);
248+
if (default_acl) {
249+
error = ext2_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);
250+
posix_acl_release(default_acl);
251+
}
252+
if (acl) {
253+
if (!error)
254+
error = ext2_set_acl(inode, acl, ACL_TYPE_ACCESS);
255+
posix_acl_release(acl);
256+
}
401257
return error;
402258
}
403-
404-
const struct xattr_handler ext2_xattr_acl_access_handler = {
405-
.prefix = POSIX_ACL_XATTR_ACCESS,
406-
.flags = ACL_TYPE_ACCESS,
407-
.list = ext2_xattr_list_acl_access,
408-
.get = ext2_xattr_get_acl,
409-
.set = ext2_xattr_set_acl,
410-
};
411-
412-
const struct xattr_handler ext2_xattr_acl_default_handler = {
413-
.prefix = POSIX_ACL_XATTR_DEFAULT,
414-
.flags = ACL_TYPE_DEFAULT,
415-
.list = ext2_xattr_list_acl_default,
416-
.get = ext2_xattr_get_acl,
417-
.set = ext2_xattr_set_acl,
418-
};

‎fs/ext2/acl.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,14 @@ static inline int ext2_acl_count(size_t size)
5555

5656
/* acl.c */
5757
extern struct posix_acl *ext2_get_acl(struct inode *inode, int type);
58-
extern int ext2_acl_chmod (struct inode *);
58+
extern int ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type);
5959
extern int ext2_init_acl (struct inode *, struct inode *);
6060

6161
#else
6262
#include <linux/sched.h>
6363
#define ext2_get_acl NULL
6464
#define ext2_set_acl NULL
6565

66-
static inline int
67-
ext2_acl_chmod (struct inode *inode)
68-
{
69-
return 0;
70-
}
71-
7266
static inline int ext2_init_acl (struct inode *inode, struct inode *dir)
7367
{
7468
return 0;

‎fs/ext2/file.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,5 +103,6 @@ const struct inode_operations ext2_file_inode_operations = {
103103
#endif
104104
.setattr = ext2_setattr,
105105
.get_acl = ext2_get_acl,
106+
.set_acl = ext2_set_acl,
106107
.fiemap = ext2_fiemap,
107108
};

‎fs/ext2/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1566,7 +1566,7 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr)
15661566
}
15671567
setattr_copy(inode, iattr);
15681568
if (iattr->ia_valid & ATTR_MODE)
1569-
error = ext2_acl_chmod(inode);
1569+
error = posix_acl_chmod(inode, inode->i_mode);
15701570
mark_inode_dirty(inode);
15711571

15721572
return error;

‎fs/ext2/namei.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ const struct inode_operations ext2_dir_inode_operations = {
421421
#endif
422422
.setattr = ext2_setattr,
423423
.get_acl = ext2_get_acl,
424+
.set_acl = ext2_set_acl,
424425
.tmpfile = ext2_tmpfile,
425426
};
426427

@@ -433,4 +434,5 @@ const struct inode_operations ext2_special_inode_operations = {
433434
#endif
434435
.setattr = ext2_setattr,
435436
.get_acl = ext2_get_acl,
437+
.set_acl = ext2_set_acl,
436438
};

‎fs/ext2/xattr.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ static struct mb_cache *ext2_xattr_cache;
103103
static const struct xattr_handler *ext2_xattr_handler_map[] = {
104104
[EXT2_XATTR_INDEX_USER] = &ext2_xattr_user_handler,
105105
#ifdef CONFIG_EXT2_FS_POSIX_ACL
106-
[EXT2_XATTR_INDEX_POSIX_ACL_ACCESS] = &ext2_xattr_acl_access_handler,
107-
[EXT2_XATTR_INDEX_POSIX_ACL_DEFAULT] = &ext2_xattr_acl_default_handler,
106+
[EXT2_XATTR_INDEX_POSIX_ACL_ACCESS] = &posix_acl_access_xattr_handler,
107+
[EXT2_XATTR_INDEX_POSIX_ACL_DEFAULT] = &posix_acl_default_xattr_handler,
108108
#endif
109109
[EXT2_XATTR_INDEX_TRUSTED] = &ext2_xattr_trusted_handler,
110110
#ifdef CONFIG_EXT2_FS_SECURITY
@@ -116,8 +116,8 @@ const struct xattr_handler *ext2_xattr_handlers[] = {
116116
&ext2_xattr_user_handler,
117117
&ext2_xattr_trusted_handler,
118118
#ifdef CONFIG_EXT2_FS_POSIX_ACL
119-
&ext2_xattr_acl_access_handler,
120-
&ext2_xattr_acl_default_handler,
119+
&posix_acl_access_xattr_handler,
120+
&posix_acl_default_xattr_handler,
121121
#endif
122122
#ifdef CONFIG_EXT2_FS_SECURITY
123123
&ext2_xattr_security_handler,

‎fs/ext2/xattr.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ struct ext2_xattr_entry {
5757

5858
extern const struct xattr_handler ext2_xattr_user_handler;
5959
extern const struct xattr_handler ext2_xattr_trusted_handler;
60-
extern const struct xattr_handler ext2_xattr_acl_access_handler;
61-
extern const struct xattr_handler ext2_xattr_acl_default_handler;
6260
extern const struct xattr_handler ext2_xattr_security_handler;
6361

6462
extern ssize_t ext2_listxattr(struct dentry *, char *, size_t);

0 commit comments

Comments
 (0)