mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 05:34:00 +08:00
309e8cda59
When changing a file's acl mask, __gfs2_set_acl() will first set the group bits of i_mode to the value of the mask, and only then set the actual extended attribute representing the new acl. If the second part fails (due to lack of space, for example) and the file had no acl attribute to begin with, the system will from now on assume that the mask permission bits are actual group permission bits, potentially granting access to the wrong users. Prevent this by only changing the inode mode after the acl has been set. Signed-off-by: Ernesto A. Fernández <ernesto.mnd.fernandez@gmail.com> Signed-off-by: Bob Peterson <rpeterso@redhat.com>
152 lines
3.2 KiB
C
152 lines
3.2 KiB
C
/*
|
|
* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
|
|
* Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
|
|
*
|
|
* This copyrighted material is made available to anyone wishing to use,
|
|
* modify, copy, or redistribute it subject to the terms and conditions
|
|
* of the GNU General Public License version 2.
|
|
*/
|
|
|
|
#include <linux/sched.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/completion.h>
|
|
#include <linux/buffer_head.h>
|
|
#include <linux/xattr.h>
|
|
#include <linux/posix_acl.h>
|
|
#include <linux/posix_acl_xattr.h>
|
|
#include <linux/gfs2_ondisk.h>
|
|
|
|
#include "gfs2.h"
|
|
#include "incore.h"
|
|
#include "acl.h"
|
|
#include "xattr.h"
|
|
#include "glock.h"
|
|
#include "inode.h"
|
|
#include "meta_io.h"
|
|
#include "rgrp.h"
|
|
#include "trans.h"
|
|
#include "util.h"
|
|
|
|
static const char *gfs2_acl_name(int type)
|
|
{
|
|
switch (type) {
|
|
case ACL_TYPE_ACCESS:
|
|
return XATTR_POSIX_ACL_ACCESS;
|
|
case ACL_TYPE_DEFAULT:
|
|
return XATTR_POSIX_ACL_DEFAULT;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static struct posix_acl *__gfs2_get_acl(struct inode *inode, int type)
|
|
{
|
|
struct gfs2_inode *ip = GFS2_I(inode);
|
|
struct posix_acl *acl;
|
|
const char *name;
|
|
char *data;
|
|
int len;
|
|
|
|
if (!ip->i_eattr)
|
|
return NULL;
|
|
|
|
name = gfs2_acl_name(type);
|
|
len = gfs2_xattr_acl_get(ip, name, &data);
|
|
if (len <= 0)
|
|
return ERR_PTR(len);
|
|
acl = posix_acl_from_xattr(&init_user_ns, data, len);
|
|
kfree(data);
|
|
return acl;
|
|
}
|
|
|
|
struct posix_acl *gfs2_get_acl(struct inode *inode, int type)
|
|
{
|
|
struct gfs2_inode *ip = GFS2_I(inode);
|
|
struct gfs2_holder gh;
|
|
bool need_unlock = false;
|
|
struct posix_acl *acl;
|
|
|
|
if (!gfs2_glock_is_locked_by_me(ip->i_gl)) {
|
|
int ret = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED,
|
|
LM_FLAG_ANY, &gh);
|
|
if (ret)
|
|
return ERR_PTR(ret);
|
|
need_unlock = true;
|
|
}
|
|
acl = __gfs2_get_acl(inode, type);
|
|
if (need_unlock)
|
|
gfs2_glock_dq_uninit(&gh);
|
|
return acl;
|
|
}
|
|
|
|
int __gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
|
|
{
|
|
int error;
|
|
int len;
|
|
char *data;
|
|
const char *name = gfs2_acl_name(type);
|
|
|
|
if (acl) {
|
|
len = posix_acl_to_xattr(&init_user_ns, acl, NULL, 0);
|
|
if (len == 0)
|
|
return 0;
|
|
data = kmalloc(len, GFP_NOFS);
|
|
if (data == NULL)
|
|
return -ENOMEM;
|
|
error = posix_acl_to_xattr(&init_user_ns, acl, data, len);
|
|
if (error < 0)
|
|
goto out;
|
|
} else {
|
|
data = NULL;
|
|
len = 0;
|
|
}
|
|
|
|
error = __gfs2_xattr_set(inode, name, data, len, 0, GFS2_EATYPE_SYS);
|
|
if (error)
|
|
goto out;
|
|
set_cached_acl(inode, type, acl);
|
|
out:
|
|
kfree(data);
|
|
return error;
|
|
}
|
|
|
|
int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
|
|
{
|
|
struct gfs2_inode *ip = GFS2_I(inode);
|
|
struct gfs2_holder gh;
|
|
bool need_unlock = false;
|
|
int ret;
|
|
umode_t mode;
|
|
|
|
if (acl && acl->a_count > GFS2_ACL_MAX_ENTRIES(GFS2_SB(inode)))
|
|
return -E2BIG;
|
|
|
|
ret = gfs2_rsqa_alloc(ip);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (!gfs2_glock_is_locked_by_me(ip->i_gl)) {
|
|
ret = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
|
|
if (ret)
|
|
return ret;
|
|
need_unlock = true;
|
|
}
|
|
|
|
mode = inode->i_mode;
|
|
if (type == ACL_TYPE_ACCESS && acl) {
|
|
ret = posix_acl_update_mode(inode, &mode, &acl);
|
|
if (ret)
|
|
goto unlock;
|
|
}
|
|
|
|
ret = __gfs2_set_acl(inode, acl, type);
|
|
if (!ret && mode != inode->i_mode) {
|
|
inode->i_mode = mode;
|
|
mark_inode_dirty(inode);
|
|
}
|
|
unlock:
|
|
if (need_unlock)
|
|
gfs2_glock_dq_uninit(&gh);
|
|
return ret;
|
|
}
|