Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

vfs: fix permission checking in sys_utimensat

If utimensat() is called with both times set to UTIME_NOW or one of them to
UTIME_NOW and the other to UTIME_OMIT, then it will update the file time
without any permission checking.

I don't think this can be used for anything other than a local DoS, but could
be quite bewildering at that (e.g. "Why was that large source tree rebuilt
when I didn't modify anything???")

This affects all kernels from 2.6.22, when the utimensat() syscall was
introduced.

Fix by doing the same permission checking as for the "times == NULL" case.

Thanks to Michael Kerrisk, whose utimensat-non-conformances-and-fixes.patch in
-mm also fixes this (and breaks other stuff), only he didn't realize the
security implications of this bug.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Cc: Ulrich Drepper <drepper@redhat.com>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Miklos Szeredi and committed by
Linus Torvalds
02c6be61 2850699c

+15 -2
+15 -2
fs/utimes.c
··· 40 40 41 41 #endif 42 42 43 + static bool nsec_special(long nsec) 44 + { 45 + return nsec == UTIME_OMIT || nsec == UTIME_NOW; 46 + } 47 + 43 48 static bool nsec_valid(long nsec) 44 49 { 45 - if (nsec == UTIME_OMIT || nsec == UTIME_NOW) 50 + if (nsec_special(nsec)) 46 51 return true; 47 52 48 53 return nsec >= 0 && nsec <= 999999999; ··· 124 119 newattrs.ia_mtime.tv_nsec = times[1].tv_nsec; 125 120 newattrs.ia_valid |= ATTR_MTIME_SET; 126 121 } 127 - } else { 122 + } 123 + 124 + /* 125 + * If times is NULL or both times are either UTIME_OMIT or 126 + * UTIME_NOW, then need to check permissions, because 127 + * inode_change_ok() won't do it. 128 + */ 129 + if (!times || (nsec_special(times[0].tv_nsec) && 130 + nsec_special(times[1].tv_nsec))) { 128 131 error = -EACCES; 129 132 if (IS_IMMUTABLE(inode)) 130 133 goto mnt_drop_write_and_out;