Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7c1938e authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

userns: Convert stat to return values mapped from kuids and kgids 



- Store uids and gids with kuid_t and kgid_t in struct kstat
- Convert uid and gids to userspace usable values with
  from_kuid and from_kgid

Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 52137abe

arch/arm/kernel/sys_oabi-compat.c

+2 −2
Original line number Diff line number Diff line
@@ -124,8 +124,8 @@ static long cp_oldabi_stat64(struct kstat *stat, 
	tmp.__st_ino = stat->ino;

	tmp.st_mode = stat->mode;

	tmp.st_nlink = stat->nlink;

	tmp.st_uid = stat->uid;

	tmp.st_gid = stat->gid;

	tmp.st_uid = from_kuid_munged(current_user_ns(), stat->uid);

	tmp.st_gid = from_kgid_munged(current_user_ns(), stat->gid);

	tmp.st_rdev = huge_encode_dev(stat->rdev);

	tmp.st_size = stat->size;

	tmp.st_blocks = stat->blocks;

arch/parisc/hpux/fs.c

+2 −2
Original line number Diff line number Diff line
@@ -159,8 +159,8 @@ static int cp_hpux_stat(struct kstat *stat, struct hpux_stat64 __user *statbuf) 
	tmp.st_ino = stat->ino;

	tmp.st_mode = stat->mode;

	tmp.st_nlink = stat->nlink;

	tmp.st_uid = stat->uid;

	tmp.st_gid = stat->gid;

	tmp.st_uid = from_kuid_munged(current_user_ns(), stat->uid);

	tmp.st_gid = from_kgid_munged(current_user_ns(), stat->gid);

	tmp.st_rdev = new_encode_dev(stat->rdev);

	tmp.st_size = stat->size;

	tmp.st_atime = stat->atime.tv_sec;

arch/s390/kernel/compat_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -547,8 +547,8 @@ static int cp_stat64(struct stat64_emu31 __user *ubuf, struct kstat *stat) 
	tmp.__st_ino = (u32)stat->ino;

	tmp.st_mode = stat->mode;

	tmp.st_nlink = (unsigned int)stat->nlink;

	tmp.st_uid = stat->uid;

	tmp.st_gid = stat->gid;

	tmp.st_uid = from_kuid_munged(current_user_ns(), stat->uid);

	tmp.st_gid = from_kgid_munged(current_user_ns(), stat->gid);

	tmp.st_rdev = huge_encode_dev(stat->rdev);

	tmp.st_size = stat->size;

	tmp.st_blksize = (u32)stat->blksize;

arch/sparc/kernel/sys_sparc32.c

+2 −2
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ static int cp_compat_stat64(struct kstat *stat, 
	err |= put_user(stat->ino, &statbuf->st_ino);

	err |= put_user(stat->mode, &statbuf->st_mode);

	err |= put_user(stat->nlink, &statbuf->st_nlink);

	err |= put_user(stat->uid, &statbuf->st_uid);

	err |= put_user(stat->gid, &statbuf->st_gid);

	err |= put_user(from_kuid_munged(current_user_ns(), stat->uid), &statbuf->st_uid);

	err |= put_user(from_kgid_munged(current_user_ns(), stat->gid), &statbuf->st_gid);

	err |= put_user(huge_encode_dev(stat->rdev), &statbuf->st_rdev);

	err |= put_user(0, (unsigned long __user *) &statbuf->__pad3[0]);

	err |= put_user(stat->size, &statbuf->st_size);

arch/x86/ia32/sys_ia32.c

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat) 
{

	typeof(ubuf->st_uid) uid = 0;

	typeof(ubuf->st_gid) gid = 0;

	SET_UID(uid, stat->uid);

	SET_GID(gid, stat->gid);

	SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));

	SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));

	if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||

	    __put_user(huge_encode_dev(stat->dev), &ubuf->st_dev) ||

	    __put_user(stat->ino, &ubuf->__st_ino) ||