Skip to content

Commit 571e5c0

Browse files
rgbriggspcmoore
authored andcommitted
audit: add OPENAT2 record to list "how" info
Since the openat2(2) syscall uses a struct open_how pointer to communicate its parameters they are not usefully recorded by the audit SYSCALL record's four existing arguments. Add a new audit record type OPENAT2 that reports the parameters in its third argument, struct open_how with fields oflag, mode and resolve. The new record in the context of an event would look like: time->Wed Mar 17 16:28:53 2021 type=PROCTITLE msg=audit(1616012933.531:184): proctitle= 73797363616C6C735F66696C652F6F70656E617432002F746D702F61756469742D 7465737473756974652D737641440066696C652D6F70656E617432 type=PATH msg=audit(1616012933.531:184): item=1 name="file-openat2" inode=29 dev=00:1f mode=0100600 ouid=0 ogid=0 rdev=00:00 obj=unconfined_u:object_r:user_tmp_t:s0 nametype=CREATE cap_fp=0 cap_fi=0 cap_fe=0 cap_fver=0 cap_frootid=0 type=PATH msg=audit(1616012933.531:184): item=0 name="/root/rgb/git/audit-testsuite/tests" inode=25 dev=00:1f mode=040700 ouid=0 ogid=0 rdev=00:00 obj=unconfined_u:object_r:user_tmp_t:s0 nametype=PARENT cap_fp=0 cap_fi=0 cap_fe=0 cap_fver=0 cap_frootid=0 type=CWD msg=audit(1616012933.531:184): cwd="/root/rgb/git/audit-testsuite/tests" type=OPENAT2 msg=audit(1616012933.531:184): oflag=0100302 mode=0600 resolve=0xa type=SYSCALL msg=audit(1616012933.531:184): arch=c000003e syscall=437 success=yes exit=4 a0=3 a1=7ffe315f1c53 a2=7ffe315f1550 a3=18 items=2 ppid=528 pid=540 auid=0 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=ttyS0 ses=1 comm="openat2" exe="/root/rgb/git/audit-testsuite/tests/syscalls_file/openat2" subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 key="testsuite-1616012933-bjAUcEPO" Link: https://lore.kernel.org/r/d23fbb89186754487850367224b060e26f9b7181.1621363275.git.rgb@redhat.com Signed-off-by: Richard Guy Briggs <[email protected]> Acked-by: Christian Brauner <[email protected]> [PM: tweak subject, wrap example, move AUDIT_OPENAT2 to 1337] Signed-off-by: Paul Moore <[email protected]>
1 parent 1c30e3a commit 571e5c0

File tree

5 files changed

+32
-1
lines changed

5 files changed

+32
-1
lines changed

fs/open.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,6 +1248,8 @@ SYSCALL_DEFINE4(openat2, int, dfd, const char __user *, filename,
12481248
if (err)
12491249
return err;
12501250

1251+
audit_openat2_how(&tmp);
1252+
12511253
/* O_LARGEFILE is only allowed for non-O_PATH. */
12521254
if (!(tmp.flags & O_PATH) && force_o_largefile())
12531255
tmp.flags |= O_LARGEFILE;

include/linux/audit.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ extern int __audit_log_bprm_fcaps(struct linux_binprm *bprm,
399399
const struct cred *old);
400400
extern void __audit_log_capset(const struct cred *new, const struct cred *old);
401401
extern void __audit_mmap_fd(int fd, int flags);
402+
extern void __audit_openat2_how(struct open_how *how);
402403
extern void __audit_log_kern_module(char *name);
403404
extern void __audit_fanotify(unsigned int response);
404405
extern void __audit_tk_injoffset(struct timespec64 offset);
@@ -495,6 +496,12 @@ static inline void audit_mmap_fd(int fd, int flags)
495496
__audit_mmap_fd(fd, flags);
496497
}
497498

499+
static inline void audit_openat2_how(struct open_how *how)
500+
{
501+
if (unlikely(!audit_dummy_context()))
502+
__audit_openat2_how(how);
503+
}
504+
498505
static inline void audit_log_kern_module(char *name)
499506
{
500507
if (!audit_dummy_context())
@@ -646,6 +653,9 @@ static inline void audit_log_capset(const struct cred *new,
646653
static inline void audit_mmap_fd(int fd, int flags)
647654
{ }
648655

656+
static inline void audit_openat2_how(struct open_how *how)
657+
{ }
658+
649659
static inline void audit_log_kern_module(char *name)
650660
{
651661
}

include/uapi/linux/audit.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
#define AUDIT_TIME_ADJNTPVAL 1333 /* NTP value adjustment */
119119
#define AUDIT_BPF 1334 /* BPF subsystem */
120120
#define AUDIT_EVENT_LISTENER 1335 /* Task joined multicast read socket */
121+
#define AUDIT_OPENAT2 1337 /* Record showing openat2 how args */
121122

122123
#define AUDIT_AVC 1400 /* SE Linux avc denial or grant */
123124
#define AUDIT_SELINUX_ERR 1401 /* Internal SE Linux Errors */

kernel/audit.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/skbuff.h>
1515
#include <uapi/linux/mqueue.h>
1616
#include <linux/tty.h>
17+
#include <uapi/linux/openat2.h> // struct open_how
1718

1819
/* AUDIT_NAMES is the number of slots we reserve in the audit_context
1920
* for saving names from getname(). If we get more names we will allocate
@@ -188,6 +189,7 @@ struct audit_context {
188189
int fd;
189190
int flags;
190191
} mmap;
192+
struct open_how openat2;
191193
struct {
192194
int argc;
193195
} execve;

kernel/auditsc.c

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
#include <linux/fsnotify_backend.h>
6464
#include <uapi/linux/limits.h>
6565
#include <uapi/linux/netfilter/nf_tables.h>
66-
#include <uapi/linux/openat2.h>
66+
#include <uapi/linux/openat2.h> // struct open_how
6767

6868
#include "audit.h"
6969

@@ -1306,6 +1306,12 @@ static void show_special(struct audit_context *context, int *call_panic)
13061306
audit_log_format(ab, "fd=%d flags=0x%x", context->mmap.fd,
13071307
context->mmap.flags);
13081308
break;
1309+
case AUDIT_OPENAT2:
1310+
audit_log_format(ab, "oflag=0%llo mode=0%llo resolve=0x%llx",
1311+
context->openat2.flags,
1312+
context->openat2.mode,
1313+
context->openat2.resolve);
1314+
break;
13091315
case AUDIT_EXECVE:
13101316
audit_log_execve_info(context, &ab);
13111317
break;
@@ -2536,6 +2542,16 @@ void __audit_mmap_fd(int fd, int flags)
25362542
context->type = AUDIT_MMAP;
25372543
}
25382544

2545+
void __audit_openat2_how(struct open_how *how)
2546+
{
2547+
struct audit_context *context = audit_context();
2548+
2549+
context->openat2.flags = how->flags;
2550+
context->openat2.mode = how->mode;
2551+
context->openat2.resolve = how->resolve;
2552+
context->type = AUDIT_OPENAT2;
2553+
}
2554+
25392555
void __audit_log_kern_module(char *name)
25402556
{
25412557
struct audit_context *context = audit_context();

0 commit comments

Comments
 (0)