mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
Fix permission checking for the new utimensat() system call
Commit 1c710c896e
added the utimensat()
system call, but didn't handle the case of checking for the writability
of the target right, when the target was a file descriptor, not a
filename.
We cannot use vfs_permission(MAY_WRITE) for that case, and need to
simply check whether the file descriptor is writable. The oops from
using the wrong function was noticed and narrowed down by Markus
Trippelsdorf.
Cc: Ulrich Drepper <drepper@redhat.com>
Cc: Markus Trippelsdorf <markus@trippelsdorf.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Al Viro <viro@ftp.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4e99325b46
commit
1e5de2837c
1 changed files with 10 additions and 3 deletions
13
fs/utimes.c
13
fs/utimes.c
|
@ -106,9 +106,16 @@ long do_utimes(int dfd, char __user *filename, struct timespec *times, int flags
|
|||
if (IS_IMMUTABLE(inode))
|
||||
goto dput_and_out;
|
||||
|
||||
if (current->fsuid != inode->i_uid &&
|
||||
(error = vfs_permission(&nd, MAY_WRITE)) != 0)
|
||||
goto dput_and_out;
|
||||
if (current->fsuid != inode->i_uid) {
|
||||
if (f) {
|
||||
if (!(f->f_mode & FMODE_WRITE))
|
||||
goto dput_and_out;
|
||||
} else {
|
||||
error = vfs_permission(&nd, MAY_WRITE);
|
||||
if (error)
|
||||
goto dput_and_out;
|
||||
}
|
||||
}
|
||||
}
|
||||
mutex_lock(&inode->i_mutex);
|
||||
error = notify_change(dentry, &newattrs);
|
||||
|
|
Loading…
Reference in a new issue