* [PATCH] apparmor: Remove redundant if check in sk_peer_get_label
@ 2026-02-04 22:07 Thorsten Blum
2026-03-18 5:59 ` John Johansen
0 siblings, 1 reply; 2+ messages in thread
From: Thorsten Blum @ 2026-02-04 22:07 UTC (permalink / raw)
To: John Johansen, Paul Moore, James Morris, Serge E. Hallyn
Cc: Thorsten Blum, apparmor, linux-security-module, linux-kernel
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>
---
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 a87cd60ed206..54343f7c96a4 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -1536,15 +1536,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);
}
/**
--
Thorsten Blum <thorsten.blum@linux.dev>
GPG: 1D60 735E 8AEF 3BE4 73B6 9D84 7336 78FD 8DFE EAD4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] apparmor: Remove redundant if check in sk_peer_get_label
2026-02-04 22:07 [PATCH] apparmor: Remove redundant if check in sk_peer_get_label Thorsten Blum
@ 2026-03-18 5:59 ` John Johansen
0 siblings, 0 replies; 2+ messages in thread
From: John Johansen @ 2026-03-18 5:59 UTC (permalink / raw)
To: Thorsten Blum, Paul Moore, James Morris, Serge E. Hallyn
Cc: apparmor, linux-security-module, linux-kernel
On 2/4/26 14:07, 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>
Acked-by: John Johansen <john.johansen@canonical.com>
I have pulled this 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 a87cd60ed206..54343f7c96a4 100644
> --- a/security/apparmor/lsm.c
> +++ b/security/apparmor/lsm.c
> @@ -1536,15 +1536,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);
> }
>
> /**
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-03-18 5:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-04 22:07 [PATCH] apparmor: Remove redundant if check in sk_peer_get_label Thorsten Blum
2026-03-18 5:59 ` John Johansen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox