From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-190d.mail.infomaniak.ch (smtp-190d.mail.infomaniak.ch [185.125.25.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D6311FF7C4 for ; Wed, 13 Nov 2024 15:21:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.25.13 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731511314; cv=none; b=F/BfWFLz4hc5jksauk3XaMa44BzJ+PG6Ql+Zoz9f2aFo/BJKe/QYmDrZH4P7+Ca+InzLKOPDHa/5B21BF9nK97eXTJjMNr10wZ2zLTPYnbkVYBuSinbFamaq82C1OuufJQ3SVZXAEWX+VkQ+TpX1FSvcEBuZDftQg2GWhIqsQBg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731511314; c=relaxed/simple; bh=oQqLj+VTG52Pd8JpuUEISAjkJSUrTrwueurA5xER+Qs=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=kdCDAKTHc7ifv5FJxEbveaPrlxXYxyOgsYK6bMVyJoFa9XMYkhzPNZ1LvpI0wqxa8Yf/FrCGmuWLvghfXrn2ihn4M6eh3jt5wcGrzD+camIq5eHhpN5MrsDpF6Ja3uWHE4CR5yeu6gwhtW47q+NEQWkFZgHCPjFGSfUBH9ZZExo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=digikod.net; spf=pass smtp.mailfrom=digikod.net; dkim=pass (1024-bit key) header.d=digikod.net header.i=@digikod.net header.b=ZaXq2ZJ7; arc=none smtp.client-ip=185.125.25.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=digikod.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=digikod.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=digikod.net header.i=@digikod.net header.b="ZaXq2ZJ7" Received: from smtp-4-0001.mail.infomaniak.ch (smtp-4-0001.mail.infomaniak.ch [10.7.10.108]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4XpRpN2n0nzpPM; Wed, 13 Nov 2024 16:21:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=digikod.net; s=20191114; t=1731511308; bh=jjAbEbcMySB+5Dq2slVS7gS9u4ZlQ2TKG5y+0STveNU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZaXq2ZJ7B1AxWTWiQ6a8wWVNQ+PYgUTTajpNs6/os/UM5l6BwL2w2L69DnzrLQ+Xu uynFLpcTj2mvRQak4nYaVr02NmIFyPITeB1LWzTHB5DWDrbokFJ75IO2vmoQr4U/L7 QsYd6Uy++HS//FMbOxYqwlE1v6KmLauZTJK+AsGU= Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4XpRpM3hdMzbrt; Wed, 13 Nov 2024 16:21:47 +0100 (CET) Date: Wed, 13 Nov 2024 16:21:47 +0100 From: =?utf-8?Q?Micka=C3=ABl_Sala=C3=BCn?= To: Francis Laniel Cc: Eric Paris , Paul Moore , =?utf-8?Q?G=C3=BCnther?= Noack , "Serge E . Hallyn" , Ben Scarlato , Casey Schaufler , Charles Zaffery , James Morris , Jann Horn , Jeff Xu , Jorge Lucangeli Obes , Kees Cook , Konstantin Meskhidze , Matt Bobrowski , Mikhail Ivanov , Praveen K Paladugu , Robert Salvet , Shervin Oloumi , Song Liu , Tahera Fahimi , audit@vger.kernel.org, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: Re: [RFC PATCH v2 12/14] landlock: Log TCP bind and connect denials Message-ID: <20241113.oThieDiehaa8@digikod.net> References: <20241022161009.982584-1-mic@digikod.net> <20241022161009.982584-13-mic@digikod.net> <2345615.iZASKD2KPV@pwmachine> Precedence: bulk X-Mailing-List: audit@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <2345615.iZASKD2KPV@pwmachine> X-Infomaniak-Routing: alpha On Fri, Oct 25, 2024 at 05:25:45PM +0200, Francis Laniel wrote: > Le mardi 22 octobre 2024, 18:10:07 CEST Mickaël Salaün a écrit : > > Add audit support to socket_bind and socket_connect hooks. > > > > Audit record sample: > > > > DENY: domain=4533720601 blockers=net_connect_tcp daddr=127.0.0.1 > > dest=80 SYSCALL: arch=c000003e syscall=42 success=no exit=-13 ... > > > > Cc: Günther Noack > > Cc: Konstantin Meskhidze > > Cc: Mikhail Ivanov > > Signed-off-by: Mickaël Salaün > > Link: https://lore.kernel.org/r/20241022161009.982584-13-mic@digikod.net > > --- > > security/landlock/audit.c | 11 +++++++++ > > security/landlock/audit.h | 1 + > > security/landlock/net.c | 52 ++++++++++++++++++++++++++++++++++++--- > > 3 files changed, 60 insertions(+), 4 deletions(-) > > > > diff --git a/security/landlock/audit.c b/security/landlock/audit.c > > index 898c95ebe847..c31a4a8719ee 100644 > > --- a/security/landlock/audit.c > > +++ b/security/landlock/audit.c > > @@ -41,6 +41,12 @@ static const char *const fs_access_strings[] = { > > }; > > static_assert(ARRAY_SIZE(fs_access_strings) == LANDLOCK_NUM_ACCESS_FS); > > > > +static const char *const net_access_strings[] = { > > + [BIT_INDEX(LANDLOCK_ACCESS_NET_BIND_TCP)] = "net_bind_tcp", > > + [BIT_INDEX(LANDLOCK_ACCESS_NET_CONNECT_TCP)] = "net_connect_tcp", > > +}; > > +static_assert(ARRAY_SIZE(net_access_strings) == LANDLOCK_NUM_ACCESS_NET); > > + > > static __attribute_const__ const char * > > get_blocker(const enum landlock_request_type type, > > const unsigned long access_bit) > > @@ -58,6 +64,11 @@ get_blocker(const enum landlock_request_type type, > > if (WARN_ON_ONCE(access_bit >= ARRAY_SIZE(fs_access_strings))) > > return "unknown"; > > return fs_access_strings[access_bit]; > > + > > + case LANDLOCK_REQUEST_NET_ACCESS: > > + if (WARN_ON_ONCE(access_bit >= ARRAY_SIZE(net_access_strings))) > > + return "unknown"; > > + return net_access_strings[access_bit]; > > } > > > > WARN_ON_ONCE(1); > > diff --git a/security/landlock/audit.h b/security/landlock/audit.h > > index 320394fd6b84..1075b0c8401f 100644 > > --- a/security/landlock/audit.h > > +++ b/security/landlock/audit.h > > @@ -18,6 +18,7 @@ enum landlock_request_type { > > LANDLOCK_REQUEST_PTRACE = 1, > > LANDLOCK_REQUEST_FS_CHANGE_LAYOUT, > > LANDLOCK_REQUEST_FS_ACCESS, > > + LANDLOCK_REQUEST_NET_ACCESS, > > }; > > > > /* > > diff --git a/security/landlock/net.c b/security/landlock/net.c > > index 27872d0f7e11..c21afd6e0b4d 100644 > > --- a/security/landlock/net.c > > +++ b/security/landlock/net.c > > @@ -7,10 +7,12 @@ > > */ > > > > #include > > +#include > > #include > > #include > > #include > > > > +#include "audit.h" > > #include "common.h" > > #include "cred.h" > > #include "limits.h" > > @@ -56,6 +58,10 @@ static int current_check_access_socket(struct socket > > *const sock, }; > > const struct landlock_ruleset *const dom = > > landlock_match_ruleset(landlock_get_current_domain(), any_net); > > + struct lsm_network_audit audit_net = {}; > > + struct landlock_request request = { > > + .type = LANDLOCK_REQUEST_NET_ACCESS, > > + }; > > > > if (!dom) > > return 0; > > @@ -72,18 +78,49 @@ static int current_check_access_socket(struct socket > > *const sock, > > > > switch (address->sa_family) { > > case AF_UNSPEC: > > - case AF_INET: > > + case AF_INET: { > > + const struct sockaddr_in *addr4; > > + > > if (addrlen < sizeof(struct sockaddr_in)) > > return -EINVAL; > > - port = ((struct sockaddr_in *)address)->sin_port; > > + > > + addr4 = (struct sockaddr_in *)address; > > + port = addr4->sin_port; > > + > > + if (access_request == LANDLOCK_ACCESS_NET_CONNECT_TCP) { > > + audit_net.dport = port; > > + audit_net.v4info.daddr = addr4->sin_addr.s_addr; > > + } else if (access_request == LANDLOCK_ACCESS_NET_BIND_TCP) { > > + audit_net.sport = port; > > + audit_net.v4info.saddr = addr4->sin_addr.s_addr; > > + } else { > > + WARN_ON_ONCE(1); > > + } > > break; > > + } > > > > #if IS_ENABLED(CONFIG_IPV6) > > - case AF_INET6: > > + case AF_INET6: { > > + const struct sockaddr_in6 *addr6; > > + > > if (addrlen < SIN6_LEN_RFC2133) > > return -EINVAL; > > - port = ((struct sockaddr_in6 *)address)->sin6_port; > > + > > + addr6 = (struct sockaddr_in6 *)address; > > + port = addr6->sin6_port; > > + audit_net.v6info.saddr = addr6->sin6_addr; > > You set this for all access_request, but not for IPv4, is this done on > purpose? Indeed, this is a bug, I'll remove this line. Thanks! > > > + > > + if (access_request == LANDLOCK_ACCESS_NET_CONNECT_TCP) { > > + audit_net.dport = port; > > + audit_net.v6info.daddr = addr6->sin6_addr; > > + } else if (access_request == LANDLOCK_ACCESS_NET_BIND_TCP) { > > + audit_net.sport = port; > > + audit_net.v6info.saddr = addr6->sin6_addr; > > + } else { > > + WARN_ON_ONCE(1); > > + } > > break; > > + } > > #endif /* IS_ENABLED(CONFIG_IPV6) */ > > > > default: