The skb_owned_by hook was added with the commit ca10b9e9a8ca
("selinux: add a skb_owned_by() hook") and later removed
when said commit was reverted.
Later on, when switching to list of hooks, a field named
'skb_owned_by' was included into the security_hook_head struct,
but without any users nor caller.
This commit removes the said left-over field.
Fixes: b1d9e6b0646d ("LSM: Switch to lists of hooks")
Signed-off-by: Paolo Abeni <[email protected]>
---
include/linux/lsm_hooks.h | 1 -
security/security.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
index cdee11c..ae25378 100644
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
@@ -1804,7 +1804,6 @@ struct security_hook_heads {
struct list_head tun_dev_attach_queue;
struct list_head tun_dev_attach;
struct list_head tun_dev_open;
- struct list_head skb_owned_by;
#endif /* CONFIG_SECURITY_NETWORK */
#ifdef CONFIG_SECURITY_NETWORK_XFRM
struct list_head xfrm_policy_alloc_security;
diff --git a/security/security.c b/security/security.c
index 3644b03..554c3fb 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1848,7 +1848,6 @@ struct security_hook_heads security_hook_heads = {
.tun_dev_attach =
LIST_HEAD_INIT(security_hook_heads.tun_dev_attach),
.tun_dev_open = LIST_HEAD_INIT(security_hook_heads.tun_dev_open),
- .skb_owned_by = LIST_HEAD_INIT(security_hook_heads.skb_owned_by),
#endif /* CONFIG_SECURITY_NETWORK */
#ifdef CONFIG_SECURITY_NETWORK_XFRM
.xfrm_policy_alloc_security =
--
1.8.3.1
On 4/8/2016 3:20 AM, Paolo Abeni wrote:
> The skb_owned_by hook was added with the commit ca10b9e9a8ca
> ("selinux: add a skb_owned_by() hook") and later removed
> when said commit was reverted.
>
> Later on, when switching to list of hooks, a field named
> 'skb_owned_by' was included into the security_hook_head struct,
> but without any users nor caller.
>
> This commit removes the said left-over field.
>
> Fixes: b1d9e6b0646d ("LSM: Switch to lists of hooks")
> Signed-off-by: Paolo Abeni <[email protected]>
Acked-by: Casey Schaufler <[email protected]>
> ---
> include/linux/lsm_hooks.h | 1 -
> security/security.c | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
> index cdee11c..ae25378 100644
> --- a/include/linux/lsm_hooks.h
> +++ b/include/linux/lsm_hooks.h
> @@ -1804,7 +1804,6 @@ struct security_hook_heads {
> struct list_head tun_dev_attach_queue;
> struct list_head tun_dev_attach;
> struct list_head tun_dev_open;
> - struct list_head skb_owned_by;
> #endif /* CONFIG_SECURITY_NETWORK */
> #ifdef CONFIG_SECURITY_NETWORK_XFRM
> struct list_head xfrm_policy_alloc_security;
> diff --git a/security/security.c b/security/security.c
> index 3644b03..554c3fb 100644
> --- a/security/security.c
> +++ b/security/security.c
> @@ -1848,7 +1848,6 @@ struct security_hook_heads security_hook_heads = {
> .tun_dev_attach =
> LIST_HEAD_INIT(security_hook_heads.tun_dev_attach),
> .tun_dev_open = LIST_HEAD_INIT(security_hook_heads.tun_dev_open),
> - .skb_owned_by = LIST_HEAD_INIT(security_hook_heads.skb_owned_by),
> #endif /* CONFIG_SECURITY_NETWORK */
> #ifdef CONFIG_SECURITY_NETWORK_XFRM
> .xfrm_policy_alloc_security =
On Friday, April 08, 2016 12:20:30 PM Paolo Abeni wrote:
> The skb_owned_by hook was added with the commit ca10b9e9a8ca
> ("selinux: add a skb_owned_by() hook") and later removed
> when said commit was reverted.
>
> Later on, when switching to list of hooks, a field named
> 'skb_owned_by' was included into the security_hook_head struct,
> but without any users nor caller.
>
> This commit removes the said left-over field.
>
> Fixes: b1d9e6b0646d ("LSM: Switch to lists of hooks")
> Signed-off-by: Paolo Abeni <[email protected]>
> ---
> include/linux/lsm_hooks.h | 1 -
> security/security.c | 1 -
> 2 files changed, 2 deletions(-)
No objections here.
Acked-by: Paul Moore <[email protected]>
> diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
> index cdee11c..ae25378 100644
> --- a/include/linux/lsm_hooks.h
> +++ b/include/linux/lsm_hooks.h
> @@ -1804,7 +1804,6 @@ struct security_hook_heads {
> struct list_head tun_dev_attach_queue;
> struct list_head tun_dev_attach;
> struct list_head tun_dev_open;
> - struct list_head skb_owned_by;
> #endif /* CONFIG_SECURITY_NETWORK */
> #ifdef CONFIG_SECURITY_NETWORK_XFRM
> struct list_head xfrm_policy_alloc_security;
> diff --git a/security/security.c b/security/security.c
> index 3644b03..554c3fb 100644
> --- a/security/security.c
> +++ b/security/security.c
> @@ -1848,7 +1848,6 @@ struct security_hook_heads security_hook_heads = {
> .tun_dev_attach =
> LIST_HEAD_INIT(security_hook_heads.tun_dev_attach),
> .tun_dev_open = LIST_HEAD_INIT(security_hook_heads.tun_dev_open),
> - .skb_owned_by = LIST_HEAD_INIT(security_hook_heads.skb_owned_by),
> #endif /* CONFIG_SECURITY_NETWORK */
> #ifdef CONFIG_SECURITY_NETWORK_XFRM
> .xfrm_policy_alloc_security =
--
paul moore
http://www.paul-moore.com
On Fri, 8 Apr 2016, Paolo Abeni wrote:
> The skb_owned_by hook was added with the commit ca10b9e9a8ca
> ("selinux: add a skb_owned_by() hook") and later removed
> when said commit was reverted.
>
> Later on, when switching to list of hooks, a field named
> 'skb_owned_by' was included into the security_hook_head struct,
> but without any users nor caller.
>
> This commit removes the said left-over field.
>
> Fixes: b1d9e6b0646d ("LSM: Switch to lists of hooks")
> Signed-off-by: Paolo Abeni <[email protected]>
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next
--
James Morris
<[email protected]>