yystopf/openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!397 修复内核access chmod chown接口

Browse Source 
Merge pull request !397 from JING/kernel
This commit is contained in:
openharmony_ci
2021-07-08 02:36:56 +00:00
committed by Gitee
parent 78906f4a6c 56a95b9ec9
commit 9304a683ad
2 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
syscall/fs_syscall.c
+4 -40
View File
@@ -703,8 +703,6 @@ OUT:
int SysAccess(const char *path, int amode)
{
int ret;
struct stat buf;
struct statfs fsBuf;
char *pathRet = NULL;
if (path != NULL) {
@@ -714,30 +712,9 @@ int SysAccess(const char *path, int amode)
}
}
ret = statfs((path ? pathRet : NULL), &fsBuf);
if (ret != 0) {
ret = access(pathRet, amode);
if (ret < 0) {
ret = -get_errno();
if (ret != -ENOSYS) {
goto OUT;
} else {
/* dev has no statfs ops, need devfs to handle this in feature */
ret = LOS_OK;
}
}
if ((fsBuf.f_flags & MS_RDONLY) && ((unsigned int)amode & W_OK)) {
ret = -EROFS;
goto OUT;
}
ret = stat((path ? pathRet : NULL), &buf);
if (ret != 0) {
ret = -get_errno();
goto OUT;
}
if (VfsPermissionCheck(buf.st_uid, buf.st_gid, buf.st_mode, amode)) {
ret = -EACCES;
}
OUT:
@@ -2149,9 +2126,6 @@ OUT:
int SysChmod(const char *pathname, mode_t mode)
{
struct IATTR attr = {0};
attr.attr_chg_mode = mode;
attr.attr_chg_valid = CHG_MODE; /* change mode */
int ret;
char *pathRet = NULL;
@@ -2162,7 +2136,7 @@ int SysChmod(const char *pathname, mode_t mode)
}
}
ret = chattr((pathname ? pathRet : NULL), &attr);
ret = chmod(pathRet, mode);
if (ret < 0) {
ret = -get_errno();
}
@@ -2176,8 +2150,6 @@ OUT:
int SysChown(const char *pathname, uid_t owner, gid_t group)
{
struct IATTR attr = {0};
attr.attr_chg_valid = 0;
int ret;
char *pathRet = NULL;
@@ -2188,15 +2160,7 @@ int SysChown(const char *pathname, uid_t owner, gid_t group)
}
}
if (owner != (uid_t)-1) {
attr.attr_chg_uid = owner;
attr.attr_chg_valid |= CHG_UID;
}
if (group != (gid_t)-1) {
attr.attr_chg_gid = group;
attr.attr_chg_valid |= CHG_GID;
}
ret = chattr((pathname ? pathRet : NULL), &attr);
ret = chown(pathRet, owner, group);
if (ret < 0) {
ret = -get_errno();
}