Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cifs: Convert struct cifs_ses to use a kuid_t and a kgid_t

Browse source 
Cc: Steve French <smfrench@gmail.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2013-02-06 02:30:39 -08:00
parent 1f68233c52
commit 64ed39dd1e
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/cifs/cifs_spnego.c
View file

@ -149,10 +149,12 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo)
goto out; goto out;
dp = description + strlen(description); dp = description + strlen(description);
sprintf(dp, ";uid=0x%x", sesInfo->linux_uid); sprintf(dp, ";uid=0x%x",
from_kuid_munged(&init_user_ns, sesInfo->linux_uid));
dp = description + strlen(description); dp = description + strlen(description);
sprintf(dp, ";creduid=0x%x", sesInfo->cred_uid); sprintf(dp, ";creduid=0x%x",
from_kuid_munged(&init_user_ns, sesInfo->cred_uid));
if (sesInfo->user_name) { if (sesInfo->user_name) {
dp = description + strlen(description); dp = description + strlen(description);

4
fs/cifs/cifsglob.h
View file

@ -702,8 +702,8 @@ struct cifs_ses {
char *serverNOS; /* name of network operating system of server */ char *serverNOS; /* name of network operating system of server */
char *serverDomain; /* security realm of server */ char *serverDomain; /* security realm of server */
__u64 Suid; /* remote smb uid */ __u64 Suid; /* remote smb uid */
uid_t linux_uid; /* overriding owner of files on the mount */ kuid_t linux_uid; /* overriding owner of files on the mount */
uid_t cred_uid; /* owner of credentials */ kuid_t cred_uid; /* owner of credentials */
unsigned int capabilities; unsigned int capabilities;
char serverName[SERVER_NAME_LEN_WITH_NULL * 2]; /* BB make bigger for char serverName[SERVER_NAME_LEN_WITH_NULL * 2]; /* BB make bigger for
TCP names - will ipv6 and sctp addresses fit? */ TCP names - will ipv6 and sctp addresses fit? */

2
fs/cifs/connect.c
View file

@ -2271,7 +2271,7 @@ static int match_session(struct cifs_ses *ses, struct smb_vol *vol)
{ {
switch (ses->server->secType) { switch (ses->server->secType) {
case Kerberos: case Kerberos:
if (vol->cred_uid != ses->cred_uid) if (!uid_eq(vol->cred_uid, ses->cred_uid))
return 0; return 0;
break; break;
default: default: