mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
vfs: move permission checking into notify_change() for utimes(NULL)
This fixes a bug where the permission was not properly checked in overlayfs. The testcase is ltp/utimensat01. It is also cleaner and safer to do the permission checking in the vfs helper instead of the caller. This patch introduces an additional ia_valid flag ATTR_TOUCH (since touch(1) is the most obvious user of utimes(NULL)) that is passed into notify_change whenever the conditions for this special permission checking mode are met. Reported-by: Aihua Zhang <[email protected]> Signed-off-by: Miklos Szeredi <[email protected]> Tested-by: Aihua Zhang <[email protected]> Cc: <[email protected]> # v3.18+
This commit is contained in:
parent
e71b9dff06
commit
f2b20f6ee8
3 changed files with 17 additions and 16 deletions
17
fs/utimes.c
17
fs/utimes.c
|
|
@ -87,21 +87,7 @@ static int utimes_common(struct path *path, struct timespec *times)
|
|||
*/
|
||||
newattrs.ia_valid |= ATTR_TIMES_SET;
|
||||
} else {
|
||||
/*
|
||||
* If times is NULL (or both times are UTIME_NOW),
|
||||
* then we need to check permissions, because
|
||||
* inode_change_ok() won't do it.
|
||||
*/
|
||||
error = -EPERM;
|
||||
if (IS_IMMUTABLE(inode))
|
||||
goto mnt_drop_write_and_out;
|
||||
|
||||
error = -EACCES;
|
||||
if (!inode_owner_or_capable(inode)) {
|
||||
error = inode_permission(inode, MAY_WRITE);
|
||||
if (error)
|
||||
goto mnt_drop_write_and_out;
|
||||
}
|
||||
newattrs.ia_valid |= ATTR_TOUCH;
|
||||
}
|
||||
retry_deleg:
|
||||
inode_lock(inode);
|
||||
|
|
@ -113,7 +99,6 @@ retry_deleg:
|
|||
goto retry_deleg;
|
||||
}
|
||||
|
||||
mnt_drop_write_and_out:
|
||||
mnt_drop_write(path->mnt);
|
||||
out:
|
||||
return error;
|
||||
|
|
|
|||
Loading…
Reference in a new issue