p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!147 fix capabilities in write and execute case 

Merge pull request !147 from 野生毛霉君/master
This commit is contained in:
openharmony_ci 2021-04-17 09:46:29 +08:00 committed by Gitee
parent b684b0c85d c6b898ea30
commit 0e56ee6509
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/vfs/operation/fs_other.c
View File

@ -107,20 +107,21 @@ int VfsPermissionCheck(uint fuid, uint fgid, uint fileMode, int accMode)
tmpMode = 0;
if (S_ISDIR(fileMode)) {
if (((uint)accMode & EXEC_OP) && (IsCapPermit(CAP_DAC_READ_SEARCH))) {
if (IsCapPermit(CAP_DAC_EXECUTE)
|| (!((uint)accMode & WRITE_OP) && IsCapPermit(CAP_DAC_READ_SEARCH))) {
tmpMode |= EXEC_OP;
}
} else {
if (((uint)accMode & EXEC_OP) && (IsCapPermit(CAP_DAC_EXECUTE)) && (fileMode & MODE_IXUGO)) {
if (IsCapPermit(CAP_DAC_EXECUTE) && (fileMode & MODE_IXUGO)) {
tmpMode |= EXEC_OP;
}
}
if (((uint)accMode & WRITE_OP) && IsCapPermit(CAP_DAC_WRITE)) {
if (IsCapPermit(CAP_DAC_WRITE)) {
tmpMode |= WRITE_OP;
}
if (((uint)accMode & READ_OP) && IsCapPermit(CAP_DAC_READ_SEARCH)) {
if (IsCapPermit(CAP_DAC_READ_SEARCH)) {
tmpMode |= READ_OP;
}