mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-04 02:26:56 +07:00
fs: change return values from -EACCES to -EPERM
According to SUSv3: [EACCES] Permission denied. An attempt was made to access a file in a way forbidden by its file access permissions. [EPERM] Operation not permitted. An attempt was made to perform an operation limited to processes with appropriate privileges or to the owner of a file or other resource. So -EPERM should be returned if capability checks fails. Strictly speaking this is an API change since the error code user sees is altered. Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com> Acked-by: Jan Kara <jack@suse.cz> Acked-by: Steven Whitehouse <swhiteho@redhat.com> Acked-by: Ian Kent <raven@themaw.net> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
9cc64ceaa8
commit
4173581876
@ -587,7 +587,7 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)
|
|||||||
|
|
||||||
/* This allows root to remove symlinks */
|
/* This allows root to remove symlinks */
|
||||||
if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))
|
if (!autofs4_oz_mode(sbi) && !capable(CAP_SYS_ADMIN))
|
||||||
return -EACCES;
|
return -EPERM;
|
||||||
|
|
||||||
if (atomic_dec_and_test(&ino->count)) {
|
if (atomic_dec_and_test(&ino->count)) {
|
||||||
p_ino = autofs4_dentry_ino(dentry->d_parent);
|
p_ino = autofs4_dentry_ino(dentry->d_parent);
|
||||||
|
@ -158,7 +158,7 @@ static ssize_t cluster_set(struct dlm_cluster *cl, unsigned int *cl_field,
|
|||||||
unsigned int x;
|
unsigned int x;
|
||||||
|
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
return -EACCES;
|
return -EPERM;
|
||||||
|
|
||||||
x = simple_strtoul(buf, NULL, 0);
|
x = simple_strtoul(buf, NULL, 0);
|
||||||
|
|
||||||
|
@ -107,7 +107,7 @@ static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
|
|||||||
int n = simple_strtol(buf, NULL, 0);
|
int n = simple_strtol(buf, NULL, 0);
|
||||||
|
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
return -EACCES;
|
return -EPERM;
|
||||||
|
|
||||||
switch (n) {
|
switch (n) {
|
||||||
case 0:
|
case 0:
|
||||||
@ -135,7 +135,7 @@ static ssize_t withdraw_show(struct gfs2_sbd *sdp, char *buf)
|
|||||||
static ssize_t withdraw_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
|
static ssize_t withdraw_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
|
||||||
{
|
{
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
return -EACCES;
|
return -EPERM;
|
||||||
|
|
||||||
if (simple_strtol(buf, NULL, 0) != 1)
|
if (simple_strtol(buf, NULL, 0) != 1)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
@ -150,7 +150,7 @@ static ssize_t statfs_sync_store(struct gfs2_sbd *sdp, const char *buf,
|
|||||||
size_t len)
|
size_t len)
|
||||||
{
|
{
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
return -EACCES;
|
return -EPERM;
|
||||||
|
|
||||||
if (simple_strtol(buf, NULL, 0) != 1)
|
if (simple_strtol(buf, NULL, 0) != 1)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
@ -163,7 +163,7 @@ static ssize_t quota_sync_store(struct gfs2_sbd *sdp, const char *buf,
|
|||||||
size_t len)
|
size_t len)
|
||||||
{
|
{
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
return -EACCES;
|
return -EPERM;
|
||||||
|
|
||||||
if (simple_strtol(buf, NULL, 0) != 1)
|
if (simple_strtol(buf, NULL, 0) != 1)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
@ -179,7 +179,7 @@ static ssize_t quota_refresh_user_store(struct gfs2_sbd *sdp, const char *buf,
|
|||||||
u32 id;
|
u32 id;
|
||||||
|
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
return -EACCES;
|
return -EPERM;
|
||||||
|
|
||||||
id = simple_strtoul(buf, NULL, 0);
|
id = simple_strtoul(buf, NULL, 0);
|
||||||
|
|
||||||
@ -194,7 +194,7 @@ static ssize_t quota_refresh_group_store(struct gfs2_sbd *sdp, const char *buf,
|
|||||||
u32 id;
|
u32 id;
|
||||||
|
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
return -EACCES;
|
return -EPERM;
|
||||||
|
|
||||||
id = simple_strtoul(buf, NULL, 0);
|
id = simple_strtoul(buf, NULL, 0);
|
||||||
|
|
||||||
@ -213,7 +213,7 @@ static ssize_t demote_rq_store(struct gfs2_sbd *sdp, const char *buf, size_t len
|
|||||||
int rv;
|
int rv;
|
||||||
|
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
return -EACCES;
|
return -EPERM;
|
||||||
|
|
||||||
rv = sscanf(buf, "%u:%llu %15s", &gltype, &glnum,
|
rv = sscanf(buf, "%u:%llu %15s", &gltype, &glnum,
|
||||||
mode);
|
mode);
|
||||||
@ -502,7 +502,7 @@ static ssize_t quota_scale_store(struct gfs2_sbd *sdp, const char *buf,
|
|||||||
unsigned int x, y;
|
unsigned int x, y;
|
||||||
|
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
return -EACCES;
|
return -EPERM;
|
||||||
|
|
||||||
if (sscanf(buf, "%u %u", &x, &y) != 2 || !y)
|
if (sscanf(buf, "%u %u", &x, &y) != 2 || !y)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
@ -521,7 +521,7 @@ static ssize_t tune_set(struct gfs2_sbd *sdp, unsigned int *field,
|
|||||||
unsigned int x;
|
unsigned int x;
|
||||||
|
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
return -EACCES;
|
return -EPERM;
|
||||||
|
|
||||||
x = simple_strtoul(buf, NULL, 0);
|
x = simple_strtoul(buf, NULL, 0);
|
||||||
|
|
||||||
|
@ -819,7 +819,7 @@ long ncp_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
|||||||
case NCP_IOC_CONN_LOGGED_IN:
|
case NCP_IOC_CONN_LOGGED_IN:
|
||||||
case NCP_IOC_SETROOT:
|
case NCP_IOC_SETROOT:
|
||||||
if (!capable(CAP_SYS_ADMIN)) {
|
if (!capable(CAP_SYS_ADMIN)) {
|
||||||
ret = -EACCES;
|
ret = -EPERM;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -1711,7 +1711,7 @@ static int map_files_d_revalidate(struct dentry *dentry, unsigned int flags)
|
|||||||
return -ECHILD;
|
return -ECHILD;
|
||||||
|
|
||||||
if (!capable(CAP_SYS_ADMIN)) {
|
if (!capable(CAP_SYS_ADMIN)) {
|
||||||
status = -EACCES;
|
status = -EPERM;
|
||||||
goto out_notask;
|
goto out_notask;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1844,7 +1844,7 @@ static struct dentry *proc_map_files_lookup(struct inode *dir,
|
|||||||
struct dentry *result;
|
struct dentry *result;
|
||||||
struct mm_struct *mm;
|
struct mm_struct *mm;
|
||||||
|
|
||||||
result = ERR_PTR(-EACCES);
|
result = ERR_PTR(-EPERM);
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
@ -1900,7 +1900,7 @@ proc_map_files_readdir(struct file *filp, void *dirent, filldir_t filldir)
|
|||||||
ino_t ino;
|
ino_t ino;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = -EACCES;
|
ret = -EPERM;
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@ -204,7 +204,7 @@ long udf_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
|||||||
goto out;
|
goto out;
|
||||||
case UDF_RELOCATE_BLOCKS:
|
case UDF_RELOCATE_BLOCKS:
|
||||||
if (!capable(CAP_SYS_ADMIN)) {
|
if (!capable(CAP_SYS_ADMIN)) {
|
||||||
result = -EACCES;
|
result = -EPERM;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
if (get_user(old_block, (long __user *)arg)) {
|
if (get_user(old_block, (long __user *)arg)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user