From: John Johansen <john.johansen@canonical.com>
To: Thorsten Blum <thorsten.blum@linux.dev>,
Paul Moore <paul@paul-moore.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>
Cc: apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH RESEND] apparmor: Remove redundant if check in sk_peer_get_label
Date: Tue, 17 Mar 2026 23:32:23 -0700 [thread overview]
Message-ID: <10bcdb0a-5e85-475f-bb02-658d892f1688@canonical.com> (raw)
In-Reply-To: <20260318002141.3362-3-thorsten.blum@linux.dev>
On 3/17/26 17:21, Thorsten Blum wrote:
> Remove the redundant if check in sk_peer_get_label() and return
> ERR_PTR(-ENOPROTOOPT) directly.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
this has now been pulled into my tree
> ---
> security/apparmor/lsm.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
> index c1d42fc72fdb..f7bcfed40222 100644
> --- a/security/apparmor/lsm.c
> +++ b/security/apparmor/lsm.c
> @@ -1528,15 +1528,11 @@ static int apparmor_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
> static struct aa_label *sk_peer_get_label(struct sock *sk)
> {
> struct aa_sk_ctx *ctx = aa_sock(sk);
> - struct aa_label *label = ERR_PTR(-ENOPROTOOPT);
>
> if (rcu_access_pointer(ctx->peer))
> return aa_get_label_rcu(&ctx->peer);
>
> - if (sk->sk_family != PF_UNIX)
> - return ERR_PTR(-ENOPROTOOPT);
> -
> - return label;
> + return ERR_PTR(-ENOPROTOOPT);
> }
>
> /**
prev parent reply other threads:[~2026-03-18 6:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-18 0:21 [PATCH RESEND] apparmor: Remove redundant if check in sk_peer_get_label Thorsten Blum
2026-03-18 6:32 ` John Johansen [this message]
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=10bcdb0a-5e85-475f-bb02-658d892f1688@canonical.com \
--to=john.johansen@canonical.com \
--cc=apparmor@lists.ubuntu.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=serge@hallyn.com \
--cc=thorsten.blum@linux.dev \
/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