From: Richard Weinberger <richard@nod.at>
To: netfilter-devel@vger.kernel.org
Cc: coreteam@netfilter.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, pabeni@redhat.com, kuba@kernel.org,
edumazet@google.com, davem@davemloft.net, kadlec@netfilter.org,
pablo@netfilter.org, rgb@redhat.com, paul@paul-moore.com,
upstream+net@sigma-star.at, Richard Weinberger <richard@nod.at>
Subject: [PATCH] netfilter: Record uid and gid in xt_AUDIT
Date: Wed, 9 Oct 2024 22:32:18 +0200 [thread overview]
Message-ID: <20241009203218.26329-1-richard@nod.at> (raw)
When recording audit events for new outgoing connections,
it is helpful to log the user info of the associated socket,
if available.
Therefore, check if the skb has a socket, and if it does,
log the owning fsuid/fsgid.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
net/netfilter/xt_AUDIT.c | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/xt_AUDIT.c b/net/netfilter/xt_AUDIT.c
index b6a015aee0cec..d88b5442beaa6 100644
--- a/net/netfilter/xt_AUDIT.c
+++ b/net/netfilter/xt_AUDIT.c
@@ -9,16 +9,19 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/audit.h>
+#include <linux/cred.h>
+#include <linux/file.h>
+#include <linux/if_arp.h>
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/tcp.h>
#include <linux/udp.h>
-#include <linux/if_arp.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_AUDIT.h>
#include <linux/netfilter_bridge/ebtables.h>
-#include <net/ipv6.h>
#include <net/ip.h>
+#include <net/ipv6.h>
+#include <net/sock.h>
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Thomas Graf <tgraf@redhat.com>");
@@ -66,7 +69,9 @@ static bool audit_ip6(struct audit_buffer *ab, struct sk_buff *skb)
static unsigned int
audit_tg(struct sk_buff *skb, const struct xt_action_param *par)
{
+ struct sock *sk = skb->sk;
struct audit_buffer *ab;
+ bool got_uidgid = false;
int fam = -1;
if (audit_enabled == AUDIT_OFF)
@@ -99,6 +104,24 @@ audit_tg(struct sk_buff *skb, const struct xt_action_param *par)
if (fam == -1)
audit_log_format(ab, " saddr=? daddr=? proto=-1");
+ if (sk && sk_fullsock(sk)) {
+ read_lock_bh(&sk->sk_callback_lock);
+ if (sk->sk_socket && sk->sk_socket->file) {
+ const struct file *file = sk->sk_socket->file;
+ const struct cred *cred = file->f_cred;
+
+ audit_log_format(ab, " uid=%u gid=%u",
+ from_kuid(&init_user_ns, cred->fsuid),
+ from_kgid(&init_user_ns, cred->fsgid));
+
+ got_uidgid = true;
+ }
+ read_unlock_bh(&sk->sk_callback_lock);
+ }
+
+ if (!got_uidgid)
+ audit_log_format(ab, " uid=? gid=?");
+
audit_log_end(ab);
errout:
--
2.35.3
next reply other threads:[~2024-10-09 20:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-09 20:32 Richard Weinberger [this message]
2024-10-09 21:33 ` [PATCH] netfilter: Record uid and gid in xt_AUDIT Florian Westphal
2024-10-09 21:46 ` Paul Moore
2024-10-09 22:34 ` Florian Westphal
2024-10-10 2:02 ` Paul Moore
2024-10-10 17:59 ` Florian Westphal
2024-10-10 19:13 ` Paul Moore
2024-10-10 6:27 ` Richard Weinberger
2024-10-10 13:48 ` Florian Westphal
2024-10-10 13:53 ` Jan Engelhardt
2024-10-10 20:09 ` Richard Weinberger
2024-10-11 1:27 ` Florian Westphal
2024-10-11 13:12 ` Richard Weinberger
2024-10-09 22:02 ` Paul Moore
2024-10-10 6:24 ` Richard Weinberger
2024-10-10 19:09 ` Paul Moore
2024-10-10 20:40 ` Richard Weinberger
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=20241009203218.26329-1-richard@nod.at \
--to=richard@nod.at \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kadlec@netfilter.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pablo@netfilter.org \
--cc=paul@paul-moore.com \
--cc=rgb@redhat.com \
--cc=upstream+net@sigma-star.at \
/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).