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

powerpc/spufs: convert userns uid/gid mount options to kuid/kgid

Acked-by: Jeremy Kerr <jk@ozlabs.org>
Tested-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Ben Myers <bpm@sgi.com>

authored by

Dwight Engen and committed by
Ben Myers
ed56f34f 5d5e3d57

+6 -2
+6 -2
arch/powerpc/platforms/cell/spufs/inode.c
··· 620 620 case Opt_uid: 621 621 if (match_int(&args[0], &option)) 622 622 return 0; 623 - root->i_uid = option; 623 + root->i_uid = make_kuid(current_user_ns(), option); 624 + if (!uid_valid(root->i_uid)) 625 + return 0; 624 626 break; 625 627 case Opt_gid: 626 628 if (match_int(&args[0], &option)) 627 629 return 0; 628 - root->i_gid = option; 630 + root->i_gid = make_kgid(current_user_ns(), option); 631 + if (!gid_valid(root->i_gid)) 632 + return 0; 629 633 break; 630 634 case Opt_mode: 631 635 if (match_octal(&args[0], &option))