From ae7a5d6e831716e93f5b231e64617221c773f99a Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 19 Apr 2013 15:32:32 +0000 Subject: [PATCH] --- yaml --- r: 362667 b: refs/heads/master c: 83f1b4ba917db5dc5a061a44b3403ddb6e783494 h: refs/heads/master i: 362665: 9e4095d5a13656df367a9409e548587f78f7f5d6 362663: 0086e5e7308ab3a0c5dafe7f27d3627acf7c4827 v: v3 --- [refs] | 2 +- trunk/include/net/scm.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ccfe1fad5005..3d87ef633f0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c846ad9b880ece01bb4d8d07ba917734edf0324f +refs/heads/master: 83f1b4ba917db5dc5a061a44b3403ddb6e783494 diff --git a/trunk/include/net/scm.h b/trunk/include/net/scm.h index 975cca01048b..b11708105681 100644 --- a/trunk/include/net/scm.h +++ b/trunk/include/net/scm.h @@ -56,8 +56,8 @@ static __inline__ void scm_set_cred(struct scm_cookie *scm, scm->pid = get_pid(pid); scm->cred = cred ? get_cred(cred) : NULL; scm->creds.pid = pid_vnr(pid); - scm->creds.uid = cred ? cred->euid : INVALID_UID; - scm->creds.gid = cred ? cred->egid : INVALID_GID; + scm->creds.uid = cred ? cred->uid : INVALID_UID; + scm->creds.gid = cred ? cred->gid : INVALID_GID; } static __inline__ void scm_destroy_cred(struct scm_cookie *scm)