mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 08:30:52 +07:00
914cea93dd
When new directory 'DIR1' is created in a directory 'DIR0' with SGID bit
set, DIR1 is expected to have SGID bit set (and owning group equal to
the owning group of 'DIR0'). However when 'DIR0' also has some default
ACLs that 'DIR1' inherits, setting these ACLs will result in SGID bit on
'DIR1' to get cleared if user is not member of the owning group.
Fix the problem by moving posix_acl_update_mode() out of
__gfs2_set_acl() into gfs2_set_acl(). That way the function will not be
called when inheriting ACLs which is what we want as it prevents SGID
bit clearing and the mode has been properly set by posix_acl_create()
anyway.
Fixes: 073931017b
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
149 lines
3.2 KiB
C
149 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;
|
|
|
|
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;
|
|
}
|
|
if (type == ACL_TYPE_ACCESS && acl) {
|
|
umode_t mode = inode->i_mode;
|
|
|
|
ret = posix_acl_update_mode(inode, &inode->i_mode, &acl);
|
|
if (ret)
|
|
goto unlock;
|
|
if (mode != inode->i_mode)
|
|
mark_inode_dirty(inode);
|
|
}
|
|
|
|
ret = __gfs2_set_acl(inode, acl, type);
|
|
unlock:
|
|
if (need_unlock)
|
|
gfs2_glock_dq_uninit(&gh);
|
|
return ret;
|
|
}
|