mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
statx: don't leak STATX_ATTR_CHANGE_MONOTONIC in stx_attributes_mask
STATX_ATTR_CHANGE_MONOTONIC is kernel-internal. cp_statx() strips it
from stx_attributes but copies attributes_mask verbatim, so it leaks to
userland on filesystems that advertise it (nfs, ceph), e.g.
stx_attributes_mask = 0x8000000000303000 on NFS.
Add a new mask constant and apply it to both fields.
Fixes: a1175d6b1b ("vfs: plumb i_version handling into struct kstat")
Reviewed-by: Jan Kara <[email protected]>
Signed-off-by: Jeff Layton <[email protected]>
Link: https://patch.msgid.link/[email protected]
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Christian Brauner (Amutable) <[email protected]>
This commit is contained in:
@@ -710,8 +710,7 @@ cp_statx(const struct kstat *stat, struct statx __user *buffer)
|
||||
/* STATX_CHANGE_COOKIE is kernel-only for now */
|
||||
tmp.stx_mask = stat->result_mask & ~STATX_CHANGE_COOKIE;
|
||||
tmp.stx_blksize = stat->blksize;
|
||||
/* STATX_ATTR_CHANGE_MONOTONIC is kernel-only for now */
|
||||
tmp.stx_attributes = stat->attributes & ~STATX_ATTR_CHANGE_MONOTONIC;
|
||||
tmp.stx_attributes = stat->attributes & ~STATX_ATTR_INTERNAL_MASK;
|
||||
tmp.stx_nlink = stat->nlink;
|
||||
tmp.stx_uid = from_kuid_munged(current_user_ns(), stat->uid);
|
||||
tmp.stx_gid = from_kgid_munged(current_user_ns(), stat->gid);
|
||||
@@ -719,7 +718,8 @@ cp_statx(const struct kstat *stat, struct statx __user *buffer)
|
||||
tmp.stx_ino = stat->ino;
|
||||
tmp.stx_size = stat->size;
|
||||
tmp.stx_blocks = stat->blocks;
|
||||
tmp.stx_attributes_mask = stat->attributes_mask;
|
||||
tmp.stx_attributes_mask = stat->attributes_mask &
|
||||
~STATX_ATTR_INTERNAL_MASK;
|
||||
tmp.stx_atime.tv_sec = stat->atime.tv_sec;
|
||||
tmp.stx_atime.tv_nsec = stat->atime.tv_nsec;
|
||||
tmp.stx_btime.tv_sec = stat->btime.tv_sec;
|
||||
|
||||
@@ -69,4 +69,7 @@ struct kstat {
|
||||
/* file attribute values */
|
||||
#define STATX_ATTR_CHANGE_MONOTONIC 0x8000000000000000ULL /* version monotonically increases */
|
||||
|
||||
/* mask of STATX_ATTR_* bits that is private to the kernel */
|
||||
#define STATX_ATTR_INTERNAL_MASK (STATX_ATTR_CHANGE_MONOTONIC)
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user