diff options
author | Eric Paris <eparis@redhat.com> | 2009-05-11 13:59:10 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-05-11 21:06:01 -0400 |
commit | 37bcbf13d32e4e453e9def79ee72bd953b88302f (patch) | |
tree | 30f2dac25dc846b483558bf5ac9afec0d4ac4e5e /security/integrity/ima | |
parent | 107db7c7dd137aeb7361b8c2606ac936c0be58ff (diff) |
IMA: use current_cred() instead of current->cred
Proper invocation of the current credentials is to use current_cred() not
current->cred. This patches makes IMA use the new method.
Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/integrity/ima')
-rw-r--r-- | security/integrity/ima/ima_audit.c | 2 | ||||
-rw-r--r-- | security/integrity/ima/ima_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_audit.c b/security/integrity/ima/ima_audit.c index b628eea477a6..ff513ff737f5 100644 --- a/security/integrity/ima/ima_audit.c +++ b/security/integrity/ima/ima_audit.c | |||
@@ -41,7 +41,7 @@ void integrity_audit_msg(int audit_msgno, struct inode *inode, | |||
41 | 41 | ||
42 | ab = audit_log_start(current->audit_context, GFP_KERNEL, audit_msgno); | 42 | ab = audit_log_start(current->audit_context, GFP_KERNEL, audit_msgno); |
43 | audit_log_format(ab, "integrity: pid=%d uid=%u auid=%u ses=%u", | 43 | audit_log_format(ab, "integrity: pid=%d uid=%u auid=%u ses=%u", |
44 | current->pid, current->cred->uid, | 44 | current->pid, current_cred()->uid, |
45 | audit_get_loginuid(current), | 45 | audit_get_loginuid(current), |
46 | audit_get_sessionid(current)); | 46 | audit_get_sessionid(current)); |
47 | audit_log_task_context(ab); | 47 | audit_log_task_context(ab); |
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 122f17fc7fc1..cdae13c5ae05 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c | |||
@@ -184,7 +184,7 @@ int ima_path_check(struct path *path, int mask) | |||
184 | struct dentry *dentry = dget(path->dentry); | 184 | struct dentry *dentry = dget(path->dentry); |
185 | struct vfsmount *mnt = mntget(path->mnt); | 185 | struct vfsmount *mnt = mntget(path->mnt); |
186 | 186 | ||
187 | file = dentry_open(dentry, mnt, O_RDONLY, current->cred); | 187 | file = dentry_open(dentry, mnt, O_RDONLY, current_cred()); |
188 | rc = get_path_measurement(iint, file, dentry->d_name.name); | 188 | rc = get_path_measurement(iint, file, dentry->d_name.name); |
189 | } | 189 | } |
190 | out: | 190 | out: |