cipso: don't use IPCB() to locate the CIPSO IP option
PATCH 1/1 cipso: don't use IPCB() to locate the CIPSO IP option
Using the IPCB() macro to get the IPv4 options is convenient, but unfortunately NetLabel often needs to examine the CIPSO option outside of the scope of the IP layer in the stack. While historically IPCB() worked above the IP layer, due to the inclusion of the inet_skb_param struct at the head of the {tcp,udp}_skb_cb structs, recent commit 971f10ec ("tcp: better TCP_SKB_CB layout to reduce cache line misses") reordered the tcp_skb_cb struct and invalidated this IPCB() trick.
This patch fixes the problem by creating a new function, cipso_v4_optptr(), which locates the CIPSO option inside the IP header without calling IPCB(). Unfortunately, this isn't as fast as a simple lookup so some additional tweaks were made to limit the use of this new function.
--- include/net/cipso_ipv4.h | 25 +++++++++++++-------- net/ipv4/cipso_ipv4.c | 51 +++++++++++++++++++++++++----------------- net/netlabel/netlabel_kapi.c | 15 ++++++++---- 3 files changed, 56 insertions(+), 35 deletions(-)
include/net/cipso_ipv4.h +16 -9
@@ -121,13 +121,6 @@ extern int cipso_v4_rbm_strictvalid;#endif /* -* Helper Functions -*/ - -#define CIPSO_V4_OPTEXIST (x) (IPCB(x)->opt.cipso != 0) -#define CIPSO_V4_OPTPTR (x) (skb_network_header(x) + IPCB(x)->opt.cipso) - -/* * DOI List Functions */
@@ -190,7 +183,7 @@ static inline int cipso_v4_doi_domhsh_remove(struct cipso_v4_doi *doi_def,#ifdef CONFIG_NETLABEL void cipso_v4_cache_invalidate (void ); -int cipso_v4_cache_add (const struct sk_buff *skb, +int cipso_v4_cache_add (const unsigned char *cipso_ptr,const struct netlbl_lsm_secattr *secattr);#else static inline void cipso_v4_cache_invalidate (void )
@@ -198,7 +191,7 @@ static inline void cipso_v4_cache_invalidate(void)return ; } -static inline int cipso_v4_cache_add (const struct sk_buff *skb, +static inline int cipso_v4_cache_add (const unsigned char *cipso_ptr,const struct netlbl_lsm_secattr *secattr) {return 0 ;
@@ -211,6 +204,8 @@ static inline int cipso_v4_cache_add(const struct sk_buff *skb,#ifdef CONFIG_NETLABEL void cipso_v4_error (struct sk_buff *skb,int error,u32 gateway); +int cipso_v4_getattr (const unsigned char *cipso, +struct netlbl_lsm_secattr *secattr);int cipso_v4_sock_setattr (struct sock *sk,const struct cipso_v4_doi *doi_def,const struct netlbl_lsm_secattr *secattr);
@@ -226,6 +221,7 @@ int cipso_v4_skbuff_setattr(struct sk_buff *skb,int cipso_v4_skbuff_delattr (struct sk_buff *skb);int cipso_v4_skbuff_getattr (const struct sk_buff *skb,struct netlbl_lsm_secattr *secattr); +unsigned char *cipso_v4_optptr (const struct sk_buff *skb);int cipso_v4_validate (const struct sk_buff *skb,unsigned char **option);#else static inline void cipso_v4_error(struct sk_buff *skb,
@@ -235,6 +231,12 @@ static inline void cipso_v4_error(struct sk_buff *skb,return ; } +static inline int cipso_v4_getattr (const unsigned char *cipso, +struct netlbl_lsm_secattr *secattr) +{ +return -ENOSYS ; +} +static inline int cipso_v4_sock_setattr (struct sock *sk,const struct cipso_v4_doi *doi_def,const struct netlbl_lsm_secattr *secattr)
@@ -282,6 +284,11 @@ static inline int cipso_v4_skbuff_getattr(const struct sk_buff *skb,return -ENOSYS ; } +static inline unsigned char *cipso_v4_optptr (const struct sk_buff *skb) +{ +return NULL ; +} +static inline int cipso_v4_validate (const struct sk_buff *skb,unsigned char **option) {
net/ipv4/cipso_ipv4.c +30 -21
86 lines not on this page · raw message
net/netlabel/netlabel_kapi.c +10 -5
@@ -1065,10 +1065,12 @@ int netlbl_skbuff_getattr(const struct sk_buff *skb,u16 family, struct netlbl_lsm_secattr *secattr) { + unsigned char *ptr; +switch (family) {case AF_INET : - if (CIPSO_V4_OPTEXIST(skb) && - cipso_v4_skbuff_getattr(skb, secattr) == 0) + ptr =cipso_v4_optptr (skb); +if (ptr &&cipso_v4_getattr (ptr, secattr) ==0 )return 0 ;break ;#if IS_ENABLED (CONFIG_IPV6 )
@@ -1094,7 +1096,7 @@ int netlbl_skbuff_getattr(const struct sk_buff *skb,*/ void netlbl_skbuff_err (struct sk_buff *skb,int error,int gateway) { -if (CIPSO_V4_OPTEXIST (skb)) +if (cipso_v4_optptr (skb))cipso_v4_error (skb, error, gateway); }
@@ -1126,11 +1128,14 @@ void netlbl_cache_invalidate(void)int netlbl_cache_add (const struct sk_buff *skb,const struct netlbl_lsm_secattr *secattr) { +unsigned char *ptr; +if ((secattr->flags &NETLBL_SECATTR_CACHE ) ==0 )return -ENOMSG ; -if (CIPSO_V4_OPTEXIST (skb)) -return cipso_v4_cache_add (skb, secattr); + ptr =cipso_v4_optptr (skb); +if (ptr) +return cipso_v4_cache_add (ptr, secattr);return -ENOMSG ; }
Quoted 14 lines · Paul Moore
Using the
IPCB()macro to get the IPv4 options is convenient, but unfortunately NetLabel often needs to examine the CIPSO option outside of the scope of the IP layer in the stack. While historicallyIPCB()worked above the IP layer, due to the inclusion of theinet_skb_paramstruct at the head of the {tcp,udp}_skb_cb structs, recent commit971f10ec("tcp: betterTCP_SKB_CBlayout to reduce cache line misses") reordered thetcp_skb_cbstruct and invalidated thisIPCB()trick.This patch fixes the problem by creating a new function,
cipso_v4_optptr(), which locates the CIPSO option inside the IP header without callingIPCB(). Unfortunately, this isn't as fast as a simple lookup so some additional tweaks were made to limit the use of this new function.
Quoted 3 lines
Cc <[email protected]> # 3.18Reported-by Casey Schaufler <[email protected]>Signed-off-by Paul Moore <[email protected]>
DaveM, I'd prefer this go upstream via the SELinux/security tree so we don't have to worry about syncing up with the netdev tree to get this fix. Any objections on your part (this patch only touches NetLabel/CIPSO)?
Signature · 2 lines
paul moore security @ redhat
David Miller
maintainerFrom: Paul Moore <[email protected]>
Date: Fri, 06 Feb 2015 15:03:05 -0500
Quoted 15 lines · Paul Moore
Quoted 14 lines
Using the
IPCB()macro to get the IPv4 options is convenient, but unfortunately NetLabel often needs to examine the CIPSO option outside of the scope of the IP layer in the stack. While historicallyIPCB()worked above the IP layer, due to the inclusion of theinet_skb_paramstruct at the head of the {tcp,udp}_skb_cb structs, recent commit971f10ec("tcp: betterTCP_SKB_CBlayout to reduce cache line misses") reordered thetcp_skb_cbstruct and invalidated thisIPCB()trick.This patch fixes the problem by creating a new function,
cipso_v4_optptr(), which locates the CIPSO option inside the IP header without callingIPCB(). Unfortunately, this isn't as fast as a simple lookup so some additional tweaks were made to limit the use of this new function.
Quoted 7 lines
Quoted 3 lines
Cc <[email protected]> # 3.18Reported-by Casey Schaufler <[email protected]>Signed-off-by Paul Moore <[email protected]>DaveM, I'd prefer this go upstream via the SELinux/security tree so we don't have to worry about syncing up with the netdev tree to get this fix. Any objections on your part (this patch only touches NetLabel/CIPSO)?
No objections, please take it.
Casey Schaufler
Tested-byQuoted 15 lines · Paul Moore
Quoted 14 lines · Paul Moore
Using the
IPCB()macro to get the IPv4 options is convenient, but unfortunately NetLabel often needs to examine the CIPSO option outside of the scope of the IP layer in the stack. While historicallyIPCB()worked above the IP layer, due to the inclusion of theinet_skb_paramstruct at the head of the {tcp,udp}_skb_cb structs, recent commit971f10ec("tcp: betterTCP_SKB_CBlayout to reduce cache line misses") reordered thetcp_skb_cbstruct and invalidated thisIPCB()trick.This patch fixes the problem by creating a new function,
cipso_v4_optptr(), which locates the CIPSO option inside the IP header without callingIPCB(). Unfortunately, this isn't as fast as a simple lookup so some additional tweaks were made to limit the use of this new function.
Quoted 3 lines
Quoted 3 lines
Cc <[email protected]> # 3.18Reported-by Casey Schaufler <[email protected]>Signed-off-by Paul Moore <[email protected]>
Quoted 4 lines
DaveM, I'd prefer this go upstream via the SELinux/security tree so we don't have to worry about syncing up with the netdev tree to get this fix. Any objections on your part (this patch only touches NetLabel/CIPSO)?