Skip to content

Commit

Permalink
cifs: Convert struct cifs_ses to use a kuid_t and a kgid_t
Browse files Browse the repository at this point in the history
Cc: Steve French <[email protected]>
Signed-off-by: "Eric W. Biederman" <[email protected]>
ebiederm committed Feb 13, 2013
1 parent 1f68233 commit 64ed39d
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions fs/cifs/cifs_spnego.c
Original file line number Diff line number Diff line change
@@ -149,10 +149,12 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo)
goto out;

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);
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) {
dp = description + strlen(description);
4 changes: 2 additions & 2 deletions fs/cifs/cifsglob.h
Original file line number Diff line number Diff line change
@@ -702,8 +702,8 @@ struct cifs_ses {
char *serverNOS; /* name of network operating system of server */
char *serverDomain; /* security realm of server */
__u64 Suid; /* remote smb uid */
uid_t linux_uid; /* overriding owner of files on the mount */
uid_t cred_uid; /* owner of credentials */
kuid_t linux_uid; /* overriding owner of files on the mount */
kuid_t cred_uid; /* owner of credentials */
unsigned int capabilities;
char serverName[SERVER_NAME_LEN_WITH_NULL * 2]; /* BB make bigger for
TCP names - will ipv6 and sctp addresses fit? */
2 changes: 1 addition & 1 deletion fs/cifs/connect.c
Original file line number Diff line number Diff line change
@@ -2271,7 +2271,7 @@ static int match_session(struct cifs_ses *ses, struct smb_vol *vol)
{
switch (ses->server->secType) {
case Kerberos:
if (vol->cred_uid != ses->cred_uid)
if (!uid_eq(vol->cred_uid, ses->cred_uid))
return 0;
break;
default:

0 comments on commit 64ed39d

Please sign in to comment.