mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -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
15
fs/attr.c
15
fs/attr.c
|
|
@ -202,6 +202,21 @@ int notify_change(struct dentry * dentry, struct iattr * attr, struct inode **de
|
|||
return -EPERM;
|
||||
}
|
||||
|
||||
/*
|
||||
* If utimes(2) and friends are called with times == NULL (or both
|
||||
* times are UTIME_NOW), then we need to check for write permission
|
||||
*/
|
||||
if (ia_valid & ATTR_TOUCH) {
|
||||
if (IS_IMMUTABLE(inode))
|
||||
return -EPERM;
|
||||
|
||||
if (!inode_owner_or_capable(inode)) {
|
||||
error = inode_permission(inode, MAY_WRITE);
|
||||
if (error)
|
||||
return error;
|
||||
}
|
||||
}
|
||||
|
||||
if ((ia_valid & ATTR_MODE)) {
|
||||
umode_t amode = attr->ia_mode;
|
||||
/* Flag setting protected by i_mutex */
|
||||
|
|
|
|||
Loading…
Reference in a new issue