| Message ID | 980e4d705147a44b119fe30565c40e2424dce563.1689077819.git.gnault@redhat.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Delegated to: | Paul Moore |
| Headers | show |
| Series | net: Mark the sk parameter of routing functions as 'const'. | expand |
On Tue, Jul 11, 2023 at 03:06:08PM +0200, Guillaume Nault wrote: > The sk_getsecid hook shouldn't need to modify its socket argument. > Make it const so that callers of security_sk_classify_flow() can use a > const struct sock *. > > Signed-off-by: Guillaume Nault <gnault@redhat.com> Reviewed-by: Simon Horman <simon.horman@corigine.com>
On Tue, Jul 11, 2023 at 9:06 AM Guillaume Nault <gnault@redhat.com> wrote: > > The sk_getsecid hook shouldn't need to modify its socket argument. > Make it const so that callers of security_sk_classify_flow() can use a > const struct sock *. > > Signed-off-by: Guillaume Nault <gnault@redhat.com> > --- > include/linux/lsm_hook_defs.h | 2 +- > include/linux/security.h | 5 +++-- > security/security.c | 2 +- > security/selinux/hooks.c | 4 ++-- > 4 files changed, 7 insertions(+), 6 deletions(-) Thanks Guillaume, this looks good to me. I had limited network access last week and was only monitoring my email for urgent issues, but from what I can tell it looks like this was picked up in the netdev tree so I'll leave it alone, but if anything changes let me know and I'll merge it via the LSM tree.
On Mon, Jul 17, 2023 at 12:05:44PM -0400, Paul Moore wrote: > On Tue, Jul 11, 2023 at 9:06 AM Guillaume Nault <gnault@redhat.com> wrote: > > > > The sk_getsecid hook shouldn't need to modify its socket argument. > > Make it const so that callers of security_sk_classify_flow() can use a > > const struct sock *. > > > > Signed-off-by: Guillaume Nault <gnault@redhat.com> > > --- > > include/linux/lsm_hook_defs.h | 2 +- > > include/linux/security.h | 5 +++-- > > security/security.c | 2 +- > > security/selinux/hooks.c | 4 ++-- > > 4 files changed, 7 insertions(+), 6 deletions(-) > > Thanks Guillaume, this looks good to me. I had limited network access > last week and was only monitoring my email for urgent issues, but from > what I can tell it looks like this was picked up in the netdev tree so > I'll leave it alone, but if anything changes let me know and I'll > merge it via the LSM tree. Thanks Paul, this series has indeed been applied to the networking tree. So no special action is needed. > -- > paul-moore.com >
diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h index 7308a1a7599b..4f2621e87634 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -316,7 +316,7 @@ LSM_HOOK(int, 0, sk_alloc_security, struct sock *sk, int family, gfp_t priority) LSM_HOOK(void, LSM_RET_VOID, sk_free_security, struct sock *sk) LSM_HOOK(void, LSM_RET_VOID, sk_clone_security, const struct sock *sk, struct sock *newsk) -LSM_HOOK(void, LSM_RET_VOID, sk_getsecid, struct sock *sk, u32 *secid) +LSM_HOOK(void, LSM_RET_VOID, sk_getsecid, const struct sock *sk, u32 *secid) LSM_HOOK(void, LSM_RET_VOID, sock_graft, struct sock *sk, struct socket *parent) LSM_HOOK(int, 0, inet_conn_request, const struct sock *sk, struct sk_buff *skb, struct request_sock *req) diff --git a/include/linux/security.h b/include/linux/security.h index 32828502f09e..994cf099d9ac 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1439,7 +1439,8 @@ int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb, u int security_sk_alloc(struct sock *sk, int family, gfp_t priority); void security_sk_free(struct sock *sk); void security_sk_clone(const struct sock *sk, struct sock *newsk); -void security_sk_classify_flow(struct sock *sk, struct flowi_common *flic); +void security_sk_classify_flow(const struct sock *sk, + struct flowi_common *flic); void security_req_classify_flow(const struct request_sock *req, struct flowi_common *flic); void security_sock_graft(struct sock*sk, struct socket *parent); @@ -1597,7 +1598,7 @@ static inline void security_sk_clone(const struct sock *sk, struct sock *newsk) { } -static inline void security_sk_classify_flow(struct sock *sk, +static inline void security_sk_classify_flow(const struct sock *sk, struct flowi_common *flic) { } diff --git a/security/security.c b/security/security.c index b720424ca37d..2dfc7b9f6ed9 100644 --- a/security/security.c +++ b/security/security.c @@ -4396,7 +4396,7 @@ void security_sk_clone(const struct sock *sk, struct sock *newsk) } EXPORT_SYMBOL(security_sk_clone); -void security_sk_classify_flow(struct sock *sk, struct flowi_common *flic) +void security_sk_classify_flow(const struct sock *sk, struct flowi_common *flic) { call_void_hook(sk_getsecid, sk, &flic->flowic_secid); } diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index d06e350fedee..2bdc48dd8670 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -5167,12 +5167,12 @@ static void selinux_sk_clone_security(const struct sock *sk, struct sock *newsk) selinux_netlbl_sk_security_reset(newsksec); } -static void selinux_sk_getsecid(struct sock *sk, u32 *secid) +static void selinux_sk_getsecid(const struct sock *sk, u32 *secid) { if (!sk) *secid = SECINITSID_ANY_SOCKET; else { - struct sk_security_struct *sksec = sk->sk_security; + const struct sk_security_struct *sksec = sk->sk_security; *secid = sksec->sid; }
The sk_getsecid hook shouldn't need to modify its socket argument. Make it const so that callers of security_sk_classify_flow() can use a const struct sock *. Signed-off-by: Guillaume Nault <gnault@redhat.com> --- include/linux/lsm_hook_defs.h | 2 +- include/linux/security.h | 5 +++-- security/security.c | 2 +- security/selinux/hooks.c | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-)