From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
James Morris <jmorris@namei.org>, Peter Moody <pmoody@google.com>,
Mimi Zohar <zohar@linux.vnet.ibm.com>,
Konstantin Khlebnikov <khlebnikov@openvz.org>
Subject: linux-next: manual merge of the akpm tree with the security tree
Date: Mon, 17 Sep 2012 20:45:48 +1000 [thread overview]
Message-ID: <20120917204548.569b1095b26b98b88f768ee5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1728 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
include/linux/audit.h between commit e23eb920b0f3 ("audit: export
audit_log_task_info") from the security tree and commit "mm: use
mm->exe_file instead of first VM_EXECUTABLE vma->vm_file" from the akpm
tree.
I fixed it up (I hope - see below) and can carry the fix as necessary (no
action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/auditsc.c
index 37f52f2,31cf885..0000000
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@@ -1154,38 -1154,12 +1154,37 @@@ error_path
EXPORT_SYMBOL(audit_log_task_context);
-static void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk)
+void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk)
{
+ const struct cred *cred;
char name[sizeof(tsk->comm)];
struct mm_struct *mm = tsk->mm;
- struct vm_area_struct *vma;
+ char *tty;
+
+ if (!ab)
+ return;
/* tsk == current */
+ cred = current_cred();
+
+ spin_lock_irq(&tsk->sighand->siglock);
+ if (tsk->signal && tsk->signal->tty && tsk->signal->tty->name)
+ tty = tsk->signal->tty->name;
+ else
+ tty = "(none)";
+ spin_unlock_irq(&tsk->sighand->siglock);
+
+
+ audit_log_format(ab,
+ " ppid=%ld pid=%d auid=%u uid=%u gid=%u"
+ " euid=%u suid=%u fsuid=%u"
+ " egid=%u sgid=%u fsgid=%u ses=%u tty=%s",
+ sys_getppid(),
+ tsk->pid,
+ tsk->loginuid, cred->uid, cred->gid,
+ cred->euid, cred->suid, cred->fsuid,
+ cred->egid, cred->sgid, cred->fsgid,
+ tsk->sessionid, tty);
get_task_comm(name, tsk);
audit_log_format(ab, " comm=");
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-09-17 10:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 10:45 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-03-19 6:06 linux-next: manual merge of the akpm tree with the security tree Stephen Rothwell
2012-09-17 10:35 Stephen Rothwell
2012-02-15 4:28 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120917204548.569b1095b26b98b88f768ee5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=jmorris@namei.org \
--cc=khlebnikov@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pmoody@google.com \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).