* [PATCH next v2 6/7] xfrm: Use l3_dev for xfrm policy checks.
@ 2016-03-09 21:50 Mahesh Bandewar
2016-03-10 9:48 ` Nicolas Dichtel
0 siblings, 1 reply; 2+ messages in thread
From: Mahesh Bandewar @ 2016-03-09 21:50 UTC (permalink / raw)
To: David Miller
Cc: Mahesh Bandewar, Eric Dumazet, netdev, Tim Hockin, Alex Pollitt,
Matthew Dupre
From: Mahesh Bandewar <maheshb@google.com>
IPsec, whether it's tunnel mode or transport mode, is still a
function of L3 so all the decisions should be based on the L3
device.
Signed-off-by: Mahesh Bandewar <maheshb@google.com>
CC: Eric Dumazet <edumazet@google.com>
CC: Tim Hockin <thockin@google.com>
CC: Alex Pollitt <alex.pollitt@metaswitch.com>
CC: Matthew Dupre <matthew.dupre@metaswitch.com>
---
include/net/xfrm.h | 2 +-
net/xfrm/xfrm_policy.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index d6f6e5006ee9..30f9a351c3b9 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1067,7 +1067,7 @@ static inline int __xfrm_policy_check2(struct sock *sk, int dir,
struct sk_buff *skb,
unsigned int family, int reverse)
{
- struct net *net = dev_net(skb->dev);
+ struct net *net = dev_net(netif_get_l3_dev(skb->dev));
int ndir = dir | (reverse ? XFRM_POLICY_MASK + 1 : 0);
if (sk && sk->sk_policy[XFRM_POLICY_IN])
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index b5e665b3cfb0..c5942744f2e3 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2462,7 +2462,7 @@ static inline int secpath_has_nontransport(const struct sec_path *sp, int k, int
int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
unsigned short family)
{
- struct net *net = dev_net(skb->dev);
+ struct net *net = dev_net(netif_get_l3_dev(skb->dev));
struct xfrm_policy *pol;
struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX];
int npols = 0;
@@ -2620,7 +2620,7 @@ EXPORT_SYMBOL(__xfrm_policy_check);
int __xfrm_route_forward(struct sk_buff *skb, unsigned short family)
{
- struct net *net = dev_net(skb->dev);
+ struct net *net = dev_net(netif_get_l3_dev(skb->dev));
struct flowi fl;
struct dst_entry *dst;
int res = 1;
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH next v2 6/7] xfrm: Use l3_dev for xfrm policy checks.
2016-03-09 21:50 [PATCH next v2 6/7] xfrm: Use l3_dev for xfrm policy checks Mahesh Bandewar
@ 2016-03-10 9:48 ` Nicolas Dichtel
0 siblings, 0 replies; 2+ messages in thread
From: Nicolas Dichtel @ 2016-03-10 9:48 UTC (permalink / raw)
To: Mahesh Bandewar, David Miller
Cc: Mahesh Bandewar, Eric Dumazet, netdev, Tim Hockin, Alex Pollitt,
Matthew Dupre, Steffen Klassert
+ Steffen
Le 09/03/2016 22:50, Mahesh Bandewar a écrit :
> From: Mahesh Bandewar <maheshb@google.com>
>
> IPsec, whether it's tunnel mode or transport mode, is still a
> function of L3 so all the decisions should be based on the L3
> device.
>
> Signed-off-by: Mahesh Bandewar <maheshb@google.com>
> CC: Eric Dumazet <edumazet@google.com>
> CC: Tim Hockin <thockin@google.com>
> CC: Alex Pollitt <alex.pollitt@metaswitch.com>
> CC: Matthew Dupre <matthew.dupre@metaswitch.com>
> ---
> include/net/xfrm.h | 2 +-
> net/xfrm/xfrm_policy.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/net/xfrm.h b/include/net/xfrm.h
> index d6f6e5006ee9..30f9a351c3b9 100644
> --- a/include/net/xfrm.h
> +++ b/include/net/xfrm.h
> @@ -1067,7 +1067,7 @@ static inline int __xfrm_policy_check2(struct sock *sk, int dir,
> struct sk_buff *skb,
> unsigned int family, int reverse)
> {
> - struct net *net = dev_net(skb->dev);
> + struct net *net = dev_net(netif_get_l3_dev(skb->dev));
> int ndir = dir | (reverse ? XFRM_POLICY_MASK + 1 : 0);
>
> if (sk && sk->sk_policy[XFRM_POLICY_IN])
> diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
> index b5e665b3cfb0..c5942744f2e3 100644
> --- a/net/xfrm/xfrm_policy.c
> +++ b/net/xfrm/xfrm_policy.c
> @@ -2462,7 +2462,7 @@ static inline int secpath_has_nontransport(const struct sec_path *sp, int k, int
> int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
> unsigned short family)
> {
> - struct net *net = dev_net(skb->dev);
> + struct net *net = dev_net(netif_get_l3_dev(skb->dev));
> struct xfrm_policy *pol;
> struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX];
> int npols = 0;
> @@ -2620,7 +2620,7 @@ EXPORT_SYMBOL(__xfrm_policy_check);
>
> int __xfrm_route_forward(struct sk_buff *skb, unsigned short family)
> {
> - struct net *net = dev_net(skb->dev);
> + struct net *net = dev_net(netif_get_l3_dev(skb->dev));
> struct flowi fl;
> struct dst_entry *dst;
> int res = 1;
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-10 9:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-09 21:50 [PATCH next v2 6/7] xfrm: Use l3_dev for xfrm policy checks Mahesh Bandewar
2016-03-10 9:48 ` Nicolas Dichtel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).