leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'udp_tunnel_sk'

Browse Source 
Prevent UDP tunnels from operating on garbage socket

So this should do the rest of the work such that when we encapsulate
into a UDP tunnel, the output path works on the UDP tunnel's socket
rather than skb->sk.

Part of this work is based upon changes done by Jiri Pirko some time
ago.

Basically the first step is to pass the socket through the nf_hook
okfn(), and then next we do the same for the UDP tunnel xmit routines.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2015-04-07 15:29:30 -04:00
commit e0e8db2f89
51 changed files with 349 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/vxlan.c
View File

@ -1672,7 +1672,8 @@ static void vxlan_build_gbp_hdr(struct vxlanhdr *vxh, u32 vxflags,
} }
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
static int vxlan6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb, static int vxlan6_xmit_skb(struct dst_entry *dst, struct sock *sk,
struct sk_buff *skb,
struct net_device *dev, struct in6_addr *saddr, struct net_device *dev, struct in6_addr *saddr,
struct in6_addr *daddr, __u8 prio, __u8 ttl, struct in6_addr *daddr, __u8 prio, __u8 ttl,
__be16 src_port, __be16 dst_port, __be16 src_port, __be16 dst_port,
@ -1748,7 +1749,7 @@ static int vxlan6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb,
skb_set_inner_protocol(skb, htons(ETH_P_TEB)); skb_set_inner_protocol(skb, htons(ETH_P_TEB));
udp_tunnel6_xmit_skb(dst, skb, dev, saddr, daddr, prio, udp_tunnel6_xmit_skb(dst, sk, skb, dev, saddr, daddr, prio,
ttl, src_port, dst_port, ttl, src_port, dst_port,
!!(vxflags & VXLAN_F_UDP_ZERO_CSUM6_TX)); !!(vxflags & VXLAN_F_UDP_ZERO_CSUM6_TX));
return 0; return 0;
@ -1758,7 +1759,7 @@ err:
} }
#endif #endif
int vxlan_xmit_skb(struct rtable *rt, struct sk_buff *skb, int vxlan_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb,
__be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df, __be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df,
__be16 src_port, __be16 dst_port, __be16 src_port, __be16 dst_port,
struct vxlan_metadata *md, bool xnet, u32 vxflags) struct vxlan_metadata *md, bool xnet, u32 vxflags)
@ -1827,7 +1828,7 @@ int vxlan_xmit_skb(struct rtable *rt, struct sk_buff *skb,
skb_set_inner_protocol(skb, htons(ETH_P_TEB)); skb_set_inner_protocol(skb, htons(ETH_P_TEB));
return udp_tunnel_xmit_skb(rt, skb, src, dst, tos, return udp_tunnel_xmit_skb(rt, sk, skb, src, dst, tos,
ttl, df, src_port, dst_port, xnet, ttl, df, src_port, dst_port, xnet,
!(vxflags & VXLAN_F_UDP_CSUM)); !(vxflags & VXLAN_F_UDP_CSUM));
} }
@ -1882,6 +1883,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
struct vxlan_rdst *rdst, bool did_rsc) struct vxlan_rdst *rdst, bool did_rsc)
{ {
struct vxlan_dev *vxlan = netdev_priv(dev); struct vxlan_dev *vxlan = netdev_priv(dev);
struct sock *sk = vxlan->vn_sock->sock->sk;
struct rtable *rt = NULL; struct rtable *rt = NULL;
const struct iphdr *old_iph; const struct iphdr *old_iph;
struct flowi4 fl4; struct flowi4 fl4;
@ -1961,7 +1963,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
md.vni = htonl(vni << 8); md.vni = htonl(vni << 8);
md.gbp = skb->mark; md.gbp = skb->mark;
err = vxlan_xmit_skb(rt, skb, fl4.saddr, err = vxlan_xmit_skb(rt, sk, skb, fl4.saddr,
dst->sin.sin_addr.s_addr, tos, ttl, df, dst->sin.sin_addr.s_addr, tos, ttl, df,
src_port, dst_port, &md, src_port, dst_port, &md,
!net_eq(vxlan->net, dev_net(vxlan->dev)), !net_eq(vxlan->net, dev_net(vxlan->dev)),
@ -2021,7 +2023,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
md.vni = htonl(vni << 8); md.vni = htonl(vni << 8);
md.gbp = skb->mark; md.gbp = skb->mark;
err = vxlan6_xmit_skb(ndst, skb, dev, &fl6.saddr, &fl6.daddr, err = vxlan6_xmit_skb(ndst, sk, skb, dev, &fl6.saddr, &fl6.daddr,
0, ttl, src_port, dst_port, &md, 0, ttl, src_port, dst_port, &md,
!net_eq(vxlan->net, dev_net(vxlan->dev)), !net_eq(vxlan->net, dev_net(vxlan->dev)),
vxlan->flags); vxlan->flags);

14
include/linux/netdevice.h
View File

@ -2165,8 +2165,12 @@ int dev_open(struct net_device *dev);
int dev_close(struct net_device *dev); int dev_close(struct net_device *dev);
int dev_close_many(struct list_head *head, bool unlink); int dev_close_many(struct list_head *head, bool unlink);
void dev_disable_lro(struct net_device *dev); void dev_disable_lro(struct net_device *dev);
int dev_loopback_xmit(struct sk_buff *newskb); int dev_loopback_xmit(struct sock *sk, struct sk_buff *newskb);
int dev_queue_xmit(struct sk_buff *skb); int dev_queue_xmit_sk(struct sock *sk, struct sk_buff *skb);
static inline int dev_queue_xmit(struct sk_buff *skb)
{
return dev_queue_xmit_sk(skb->sk, skb);
}
int dev_queue_xmit_accel(struct sk_buff *skb, void *accel_priv); int dev_queue_xmit_accel(struct sk_buff *skb, void *accel_priv);
int register_netdevice(struct net_device *dev); int register_netdevice(struct net_device *dev);
void unregister_netdevice_queue(struct net_device *dev, struct list_head *head); void unregister_netdevice_queue(struct net_device *dev, struct list_head *head);
@ -2927,7 +2931,11 @@ static inline void dev_consume_skb_any(struct sk_buff *skb)
int netif_rx(struct sk_buff *skb); int netif_rx(struct sk_buff *skb);
int netif_rx_ni(struct sk_buff *skb); int netif_rx_ni(struct sk_buff *skb);
int netif_receive_skb(struct sk_buff *skb); int netif_receive_skb_sk(struct sock *sk, struct sk_buff *skb);
static inline int netif_receive_skb(struct sk_buff *skb)
{
return netif_receive_skb_sk(skb->sk, skb);
}
gro_result_t napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb); gro_result_t napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb);
void napi_gro_flush(struct napi_struct *napi, bool flush_old); void napi_gro_flush(struct napi_struct *napi, bool flush_old);
struct sk_buff *napi_get_frags(struct napi_struct *napi); struct sk_buff *napi_get_frags(struct napi_struct *napi);

89
include/linux/netfilter.h
View File

@ -45,15 +45,35 @@ struct sk_buff;
struct nf_hook_ops; struct nf_hook_ops;
struct sock;
struct nf_hook_state { struct nf_hook_state {
unsigned int hook; unsigned int hook;
int thresh; int thresh;
u_int8_t pf; u_int8_t pf;
struct net_device *in; struct net_device *in;
struct net_device *out; struct net_device *out;
int (*okfn)(struct sk_buff *); struct sock *sk;
int (*okfn)(struct sock *, struct sk_buff *);
}; };
static inline void nf_hook_state_init(struct nf_hook_state *p,
unsigned int hook,
int thresh, u_int8_t pf,
struct net_device *indev,
struct net_device *outdev,
struct sock *sk,
int (*okfn)(struct sock *, struct sk_buff *))
{
p->hook = hook;
p->thresh = thresh;
p->pf = pf;
p->in = indev;
p->out = outdev;
p->sk = sk;
p->okfn = okfn;
}
typedef unsigned int nf_hookfn(const struct nf_hook_ops *ops, typedef unsigned int nf_hookfn(const struct nf_hook_ops *ops,
struct sk_buff *skb, struct sk_buff *skb,
const struct nf_hook_state *state); const struct nf_hook_state *state);
@ -136,31 +156,29 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state);
* value indicates the packet has been consumed by the hook. * value indicates the packet has been consumed by the hook.
*/ */
static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook, static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook,
struct sock *sk,
struct sk_buff *skb, struct sk_buff *skb,
struct net_device *indev, struct net_device *indev,
struct net_device *outdev, struct net_device *outdev,
int (*okfn)(struct sk_buff *), int thresh) int (*okfn)(struct sock *, struct sk_buff *),
int thresh)
{ {
if (nf_hooks_active(pf, hook)) { if (nf_hooks_active(pf, hook)) {
struct nf_hook_state state = { struct nf_hook_state state;
.hook = hook,
.thresh = thresh,
.pf = pf,
.in = indev,
.out = outdev,
.okfn = okfn
};
nf_hook_state_init(&state, hook, thresh, pf,
indev, outdev, sk, okfn);
return nf_hook_slow(skb, &state); return nf_hook_slow(skb, &state);
} }
return 1; return 1;
} }
static inline int nf_hook(u_int8_t pf, unsigned int hook, struct sk_buff *skb, static inline int nf_hook(u_int8_t pf, unsigned int hook, struct sock *sk,
struct net_device *indev, struct net_device *outdev, struct sk_buff *skb, struct net_device *indev,
int (*okfn)(struct sk_buff *)) struct net_device *outdev,
int (*okfn)(struct sock *, struct sk_buff *))
{ {
return nf_hook_thresh(pf, hook, skb, indev, outdev, okfn, INT_MIN); return nf_hook_thresh(pf, hook, sk, skb, indev, outdev, okfn, INT_MIN);
} }
/* Activate hook; either okfn or kfree_skb called, unless a hook /* Activate hook; either okfn or kfree_skb called, unless a hook
@ -181,35 +199,36 @@ static inline int nf_hook(u_int8_t pf, unsigned int hook, struct sk_buff *skb,
*/ */
static inline int static inline int
NF_HOOK_THRESH(uint8_t pf, unsigned int hook, struct sk_buff *skb, NF_HOOK_THRESH(uint8_t pf, unsigned int hook, struct sock *sk,
struct net_device *in, struct net_device *out, struct sk_buff *skb, struct net_device *in,
int (*okfn)(struct sk_buff *), int thresh) struct net_device *out,
int (*okfn)(struct sock *, struct sk_buff *), int thresh)
{ {
int ret = nf_hook_thresh(pf, hook, skb, in, out, okfn, thresh); int ret = nf_hook_thresh(pf, hook, sk, skb, in, out, okfn, thresh);
if (ret == 1) if (ret == 1)
ret = okfn(skb); ret = okfn(sk, skb);
return ret; return ret;
} }
static inline int static inline int
NF_HOOK_COND(uint8_t pf, unsigned int hook, struct sk_buff *skb, NF_HOOK_COND(uint8_t pf, unsigned int hook, struct sock *sk,
struct net_device *in, struct net_device *out, struct sk_buff *skb, struct net_device *in, struct net_device *out,
int (*okfn)(struct sk_buff *), bool cond) int (*okfn)(struct sock *, struct sk_buff *), bool cond)
{ {
int ret; int ret;
if (!cond || if (!cond ||
((ret = nf_hook_thresh(pf, hook, skb, in, out, okfn, INT_MIN)) == 1)) ((ret = nf_hook_thresh(pf, hook, sk, skb, in, out, okfn, INT_MIN)) == 1))
ret = okfn(skb); ret = okfn(sk, skb);
return ret; return ret;
} }
static inline int static inline int
NF_HOOK(uint8_t pf, unsigned int hook, struct sk_buff *skb, NF_HOOK(uint8_t pf, unsigned int hook, struct sock *sk, struct sk_buff *skb,
struct net_device *in, struct net_device *out, struct net_device *in, struct net_device *out,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sock *, struct sk_buff *))
{ {
return NF_HOOK_THRESH(pf, hook, skb, in, out, okfn, INT_MIN); return NF_HOOK_THRESH(pf, hook, sk, skb, in, out, okfn, INT_MIN);
} }
/* Call setsockopt() */ /* Call setsockopt() */
@ -309,19 +328,21 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family)
} }
#else /* !CONFIG_NETFILTER */ #else /* !CONFIG_NETFILTER */
#define NF_HOOK(pf, hook, skb, indev, outdev, okfn) (okfn)(skb) #define NF_HOOK(pf, hook, sk, skb, indev, outdev, okfn) (okfn)(sk, skb)
#define NF_HOOK_COND(pf, hook, skb, indev, outdev, okfn, cond) (okfn)(skb) #define NF_HOOK_COND(pf, hook, sk, skb, indev, outdev, okfn, cond) (okfn)(sk, skb)
static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook, static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook,
struct sock *sk,
struct sk_buff *skb, struct sk_buff *skb,
struct net_device *indev, struct net_device *indev,
struct net_device *outdev, struct net_device *outdev,
int (*okfn)(struct sk_buff *), int thresh) int (*okfn)(struct sock *sk, struct sk_buff *), int thresh)
{ {
return okfn(skb); return okfn(sk, skb);
} }
static inline int nf_hook(u_int8_t pf, unsigned int hook, struct sk_buff *skb, static inline int nf_hook(u_int8_t pf, unsigned int hook, struct sock *sk,
struct net_device *indev, struct net_device *outdev, struct sk_buff *skb, struct net_device *indev,
int (*okfn)(struct sk_buff *)) struct net_device *outdev,
int (*okfn)(struct sock *, struct sk_buff *))
{ {
return 1; return 1;
} }

2
include/linux/netfilter_bridge.h
View File

@ -30,7 +30,7 @@ static inline unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb)
return 0; return 0;
} }
int br_handle_frame_finish(struct sk_buff *skb); int br_handle_frame_finish(struct sock *sk, struct sk_buff *skb);
static inline void br_drop_fake_rtable(struct sk_buff *skb) static inline void br_drop_fake_rtable(struct sk_buff *skb)
{ {

6
include/net/dn_neigh.h
View File

@ -18,11 +18,11 @@ struct dn_neigh {
void dn_neigh_init(void); void dn_neigh_init(void);
void dn_neigh_cleanup(void); void dn_neigh_cleanup(void);
int dn_neigh_router_hello(struct sk_buff *skb); int dn_neigh_router_hello(struct sock *sk, struct sk_buff *skb);
int dn_neigh_endnode_hello(struct sk_buff *skb); int dn_neigh_endnode_hello(struct sock *sk, struct sk_buff *skb);
void dn_neigh_pointopoint_hello(struct sk_buff *skb); void dn_neigh_pointopoint_hello(struct sk_buff *skb);
int dn_neigh_elist(struct net_device *dev, unsigned char *ptr, int n); int dn_neigh_elist(struct net_device *dev, unsigned char *ptr, int n);
int dn_to_neigh_output(struct sk_buff *skb); int dn_to_neigh_output(struct sock *sk, struct sk_buff *skb);
extern struct neigh_table dn_neigh_table; extern struct neigh_table dn_neigh_table;

3
include/net/ip.h
View File

@ -108,7 +108,8 @@ int ip_local_deliver(struct sk_buff *skb);
int ip_mr_input(struct sk_buff *skb); int ip_mr_input(struct sk_buff *skb);
int ip_output(struct sock *sk, struct sk_buff *skb); int ip_output(struct sock *sk, struct sk_buff *skb);
int ip_mc_output(struct sock *sk, struct sk_buff *skb); int ip_mc_output(struct sock *sk, struct sk_buff *skb);
int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)); int ip_fragment(struct sock *sk, struct sk_buff *skb,
int (*output)(struct sock *, struct sk_buff *));
int ip_do_nat(struct sk_buff *skb); int ip_do_nat(struct sk_buff *skb);
void ip_send_check(struct iphdr *ip); void ip_send_check(struct iphdr *ip);
int __ip_local_out(struct sk_buff *skb); int __ip_local_out(struct sk_buff *skb);

3
include/net/ip6_route.h
View File

@ -170,7 +170,8 @@ static inline bool ipv6_anycast_destination(const struct sk_buff *skb)
return rt->rt6i_flags & RTF_ANYCAST; return rt->rt6i_flags & RTF_ANYCAST;
} }
int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)); int ip6_fragment(struct sock *sk, struct sk_buff *skb,
int (*output)(struct sock *, struct sk_buff *));
static inline int ip6_skb_dst_mtu(struct sk_buff *skb) static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
{ {

5
include/net/ip6_tunnel.h
View File

@ -73,13 +73,14 @@ __u32 ip6_tnl_get_cap(struct ip6_tnl *t, const struct in6_addr *laddr,
struct net *ip6_tnl_get_link_net(const struct net_device *dev); struct net *ip6_tnl_get_link_net(const struct net_device *dev);
int ip6_tnl_get_iflink(const struct net_device *dev); int ip6_tnl_get_iflink(const struct net_device *dev);
static inline void ip6tunnel_xmit(struct sk_buff *skb, struct net_device *dev) static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb,
struct net_device *dev)
{ {
struct net_device_stats *stats = &dev->stats; struct net_device_stats *stats = &dev->stats;
int pkt_len, err; int pkt_len, err;
pkt_len = skb->len; pkt_len = skb->len;
err = ip6_local_out(skb); err = ip6_local_out_sk(sk, skb);
if (net_xmit_eval(err) == 0) { if (net_xmit_eval(err) == 0) {
struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats); struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats);

3
include/net/ipv6.h
View File

@ -769,7 +769,7 @@ static inline u8 ip6_tclass(__be32 flowinfo)
int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, int ipv6_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev); struct packet_type *pt, struct net_device *orig_dev);
int ip6_rcv_finish(struct sk_buff *skb); int ip6_rcv_finish(struct sock *sk, struct sk_buff *skb);
/* /*
* upper-layer output functions * upper-layer output functions
@ -827,6 +827,7 @@ int ip6_input(struct sk_buff *skb);
int ip6_mc_input(struct sk_buff *skb); int ip6_mc_input(struct sk_buff *skb);
int __ip6_local_out(struct sk_buff *skb); int __ip6_local_out(struct sk_buff *skb);
int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb);
int ip6_local_out(struct sk_buff *skb); int ip6_local_out(struct sk_buff *skb);
/* /*

5
include/net/udp_tunnel.h
View File

@ -77,13 +77,14 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock,
struct udp_tunnel_sock_cfg *sock_cfg); struct udp_tunnel_sock_cfg *sock_cfg);
/* Transmit the skb using UDP encapsulation. */ /* Transmit the skb using UDP encapsulation. */
int udp_tunnel_xmit_skb(struct rtable *rt, struct sk_buff *skb, int udp_tunnel_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb,
__be32 src, __be32 dst, __u8 tos, __u8 ttl, __be32 src, __be32 dst, __u8 tos, __u8 ttl,
__be16 df, __be16 src_port, __be16 dst_port, __be16 df, __be16 src_port, __be16 dst_port,
bool xnet, bool nocheck); bool xnet, bool nocheck);
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb, int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,
struct sk_buff *skb,
struct net_device *dev, struct in6_addr *saddr, struct net_device *dev, struct in6_addr *saddr,
struct in6_addr *daddr, struct in6_addr *daddr,
__u8 prio, __u8 ttl, __be16 src_port, __u8 prio, __u8 ttl, __be16 src_port,

2
include/net/vxlan.h
View File

@ -145,7 +145,7 @@ struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port,
void vxlan_sock_release(struct vxlan_sock *vs); void vxlan_sock_release(struct vxlan_sock *vs);
int vxlan_xmit_skb(struct rtable *rt, struct sk_buff *skb, int vxlan_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb,
__be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df, __be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df,
__be16 src_port, __be16 dst_port, struct vxlan_metadata *md, __be16 src_port, __be16 dst_port, struct vxlan_metadata *md,
bool xnet, u32 vxflags); bool xnet, u32 vxflags);

8
include/net/xfrm.h
View File

@ -332,7 +332,7 @@ struct xfrm_state_afinfo {
int (*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n); int (*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n);
int (*state_sort)(struct xfrm_state **dst, struct xfrm_state **src, int n); int (*state_sort)(struct xfrm_state **dst, struct xfrm_state **src, int n);
int (*output)(struct sock *sk, struct sk_buff *skb); int (*output)(struct sock *sk, struct sk_buff *skb);
int (*output_finish)(struct sk_buff *skb); int (*output_finish)(struct sock *sk, struct sk_buff *skb);
int (*extract_input)(struct xfrm_state *x, int (*extract_input)(struct xfrm_state *x,
struct sk_buff *skb); struct sk_buff *skb);
int (*extract_output)(struct xfrm_state *x, int (*extract_output)(struct xfrm_state *x,
@ -1503,7 +1503,7 @@ int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb);
int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type); int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type);
int xfrm_input_resume(struct sk_buff *skb, int nexthdr); int xfrm_input_resume(struct sk_buff *skb, int nexthdr);
int xfrm_output_resume(struct sk_buff *skb, int err); int xfrm_output_resume(struct sk_buff *skb, int err);
int xfrm_output(struct sk_buff *skb); int xfrm_output(struct sock *sk, struct sk_buff *skb);
int xfrm_inner_extract_output(struct xfrm_state *x, struct sk_buff *skb); int xfrm_inner_extract_output(struct xfrm_state *x, struct sk_buff *skb);
void xfrm_local_error(struct sk_buff *skb, int mtu); void xfrm_local_error(struct sk_buff *skb, int mtu);
int xfrm4_extract_header(struct sk_buff *skb); int xfrm4_extract_header(struct sk_buff *skb);
@ -1524,7 +1524,7 @@ static inline int xfrm4_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi)
int xfrm4_extract_output(struct xfrm_state *x, struct sk_buff *skb); int xfrm4_extract_output(struct xfrm_state *x, struct sk_buff *skb);
int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb); int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb);
int xfrm4_output(struct sock *sk, struct sk_buff *skb); int xfrm4_output(struct sock *sk, struct sk_buff *skb);
int xfrm4_output_finish(struct sk_buff *skb); int xfrm4_output_finish(struct sock *sk, struct sk_buff *skb);
int xfrm4_rcv_cb(struct sk_buff *skb, u8 protocol, int err); int xfrm4_rcv_cb(struct sk_buff *skb, u8 protocol, int err);
int xfrm4_protocol_register(struct xfrm4_protocol *handler, unsigned char protocol); int xfrm4_protocol_register(struct xfrm4_protocol *handler, unsigned char protocol);
int xfrm4_protocol_deregister(struct xfrm4_protocol *handler, unsigned char protocol); int xfrm4_protocol_deregister(struct xfrm4_protocol *handler, unsigned char protocol);
@ -1549,7 +1549,7 @@ __be32 xfrm6_tunnel_spi_lookup(struct net *net, const xfrm_address_t *saddr);
int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb); int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb);
int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb); int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb);
int xfrm6_output(struct sock *sk, struct sk_buff *skb); int xfrm6_output(struct sock *sk, struct sk_buff *skb);
int xfrm6_output_finish(struct sk_buff *skb); int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb);
int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb, int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,
u8 **prevhdr); u8 **prevhdr);

13
net/bridge/br_forward.c
View File

@ -35,7 +35,7 @@ static inline int should_deliver(const struct net_bridge_port *p,
p->state == BR_STATE_FORWARDING; p->state == BR_STATE_FORWARDING;
} }
int br_dev_queue_push_xmit(struct sk_buff *skb) int br_dev_queue_push_xmit(struct sock *sk, struct sk_buff *skb)
{ {
if (!is_skb_forwardable(skb->dev, skb)) { if (!is_skb_forwardable(skb->dev, skb)) {
kfree_skb(skb); kfree_skb(skb);
@ -49,9 +49,10 @@ int br_dev_queue_push_xmit(struct sk_buff *skb)
} }
EXPORT_SYMBOL_GPL(br_dev_queue_push_xmit); EXPORT_SYMBOL_GPL(br_dev_queue_push_xmit);
int br_forward_finish(struct sk_buff *skb) int br_forward_finish(struct sock *sk, struct sk_buff *skb)
{ {
return NF_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev, return NF_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, sk, skb,
NULL, skb->dev,
br_dev_queue_push_xmit); br_dev_queue_push_xmit);
} }
@ -75,7 +76,8 @@ static void __br_deliver(const struct net_bridge_port *to, struct sk_buff *skb)
return; return;
} }
NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, NULL, skb,
NULL, skb->dev,
br_forward_finish); br_forward_finish);
} }
@ -96,7 +98,8 @@ static void __br_forward(const struct net_bridge_port *to, struct sk_buff *skb)
skb->dev = to->dev; skb->dev = to->dev;
skb_forward_csum(skb); skb_forward_csum(skb);
NF_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev, NF_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, NULL, skb,
indev, skb->dev,
br_forward_finish); br_forward_finish);
} }

16
net/bridge/br_input.c
View File

@ -55,8 +55,9 @@ static int br_pass_frame_up(struct sk_buff *skb)
if (!skb) if (!skb)
return NET_RX_DROP; return NET_RX_DROP;
return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL, return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, NULL, skb,
netif_receive_skb); indev, NULL,
netif_receive_skb_sk);
} }
static void br_do_proxy_arp(struct sk_buff *skb, struct net_bridge *br, static void br_do_proxy_arp(struct sk_buff *skb, struct net_bridge *br,
@ -119,7 +120,7 @@ static void br_do_proxy_arp(struct sk_buff *skb, struct net_bridge *br,
} }
/* note: already called with rcu_read_lock */ /* note: already called with rcu_read_lock */
int br_handle_frame_finish(struct sk_buff *skb) int br_handle_frame_finish(struct sock *sk, struct sk_buff *skb)
{ {
const unsigned char *dest = eth_hdr(skb)->h_dest; const unsigned char *dest = eth_hdr(skb)->h_dest;
struct net_bridge_port *p = br_port_get_rcu(skb->dev); struct net_bridge_port *p = br_port_get_rcu(skb->dev);
@ -207,7 +208,7 @@ drop:
EXPORT_SYMBOL_GPL(br_handle_frame_finish); EXPORT_SYMBOL_GPL(br_handle_frame_finish);
/* note: already called with rcu_read_lock */ /* note: already called with rcu_read_lock */
static int br_handle_local_finish(struct sk_buff *skb) static int br_handle_local_finish(struct sock *sk, struct sk_buff *skb)
{ {
struct net_bridge_port *p = br_port_get_rcu(skb->dev); struct net_bridge_port *p = br_port_get_rcu(skb->dev);
u16 vid = 0; u16 vid = 0;
@ -277,8 +278,8 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb)
} }
/* Deliver packet to local host only */ /* Deliver packet to local host only */
if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev, if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, NULL, skb,
NULL, br_handle_local_finish)) { skb->dev, NULL, br_handle_local_finish)) {
return RX_HANDLER_CONSUMED; /* consumed by filter */ return RX_HANDLER_CONSUMED; /* consumed by filter */
} else { } else {
*pskb = skb; *pskb = skb;
@ -302,7 +303,8 @@ forward:
if (ether_addr_equal(p->br->dev->dev_addr, dest)) if (ether_addr_equal(p->br->dev->dev_addr, dest))
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, NULL, skb,
skb->dev, NULL,
br_handle_frame_finish); br_handle_frame_finish);
break; break;
default: default:

3
net/bridge/br_multicast.c
View File

@ -814,7 +814,8 @@ static void __br_multicast_send_query(struct net_bridge *br,
if (port) { if (port) {
skb->dev = port->dev; skb->dev = port->dev;
NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, NULL, skb,
NULL, skb->dev,
br_dev_queue_push_xmit); br_dev_queue_push_xmit);
} else { } else {
br_multicast_select_own_querier(br, ip, skb); br_multicast_select_own_querier(br, ip, skb);

56
net/bridge/br_netfilter.c
View File

@ -261,7 +261,7 @@ static void nf_bridge_update_protocol(struct sk_buff *skb)
/* PF_BRIDGE/PRE_ROUTING *********************************************/ /* PF_BRIDGE/PRE_ROUTING *********************************************/
/* Undo the changes made for ip6tables PREROUTING and continue the /* Undo the changes made for ip6tables PREROUTING and continue the
* bridge PRE_ROUTING hook. */ * bridge PRE_ROUTING hook. */
static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb) static int br_nf_pre_routing_finish_ipv6(struct sock *sk, struct sk_buff *skb)
{ {
struct nf_bridge_info *nf_bridge = skb->nf_bridge; struct nf_bridge_info *nf_bridge = skb->nf_bridge;
struct rtable *rt; struct rtable *rt;
@ -282,7 +282,8 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb)
skb->dev = nf_bridge->physindev; skb->dev = nf_bridge->physindev;
nf_bridge_update_protocol(skb); nf_bridge_update_protocol(skb);
nf_bridge_push_encap_header(skb); nf_bridge_push_encap_header(skb);
NF_HOOK_THRESH(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, NF_HOOK_THRESH(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, sk, skb,
skb->dev, NULL,
br_handle_frame_finish, 1); br_handle_frame_finish, 1);
return 0; return 0;
@ -293,7 +294,7 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb)
* don't, we use the neighbour framework to find out. In both cases, we make * don't, we use the neighbour framework to find out. In both cases, we make
* sure that br_handle_frame_finish() is called afterwards. * sure that br_handle_frame_finish() is called afterwards.
*/ */
static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb) static int br_nf_pre_routing_finish_bridge(struct sock *sk, struct sk_buff *skb)
{ {
struct nf_bridge_info *nf_bridge = skb->nf_bridge; struct nf_bridge_info *nf_bridge = skb->nf_bridge;
struct neighbour *neigh; struct neighbour *neigh;
@ -310,7 +311,7 @@ static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb)
if (neigh->hh.hh_len) { if (neigh->hh.hh_len) {
neigh_hh_bridge(&neigh->hh, skb); neigh_hh_bridge(&neigh->hh, skb);
skb->dev = nf_bridge->physindev; skb->dev = nf_bridge->physindev;
ret = br_handle_frame_finish(skb); ret = br_handle_frame_finish(sk, skb);
} else { } else {
/* the neighbour function below overwrites the complete /* the neighbour function below overwrites the complete
* MAC header, so we save the Ethernet source address and * MAC header, so we save the Ethernet source address and
@ -387,7 +388,7 @@ static bool dnat_took_place(const struct sk_buff *skb)
* device, we proceed as if ip_route_input() succeeded. If it differs from the * device, we proceed as if ip_route_input() succeeded. If it differs from the
* logical bridge port or if ip_route_output_key() fails we drop the packet. * logical bridge port or if ip_route_output_key() fails we drop the packet.
*/ */
static int br_nf_pre_routing_finish(struct sk_buff *skb) static int br_nf_pre_routing_finish(struct sock *sk, struct sk_buff *skb)
{ {
struct net_device *dev = skb->dev; struct net_device *dev = skb->dev;
struct iphdr *iph = ip_hdr(skb); struct iphdr *iph = ip_hdr(skb);
@ -440,7 +441,7 @@ bridged_dnat:
nf_bridge_push_encap_header(skb); nf_bridge_push_encap_header(skb);
NF_HOOK_THRESH(NFPROTO_BRIDGE, NF_HOOK_THRESH(NFPROTO_BRIDGE,
NF_BR_PRE_ROUTING, NF_BR_PRE_ROUTING,
skb, skb->dev, NULL, sk, skb, skb->dev, NULL,
br_nf_pre_routing_finish_bridge, br_nf_pre_routing_finish_bridge,
1); 1);
return 0; return 0;
@ -460,7 +461,8 @@ bridged_dnat:
skb->dev = nf_bridge->physindev; skb->dev = nf_bridge->physindev;
nf_bridge_update_protocol(skb); nf_bridge_update_protocol(skb);
nf_bridge_push_encap_header(skb); nf_bridge_push_encap_header(skb);
NF_HOOK_THRESH(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, NF_HOOK_THRESH(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, sk, skb,
skb->dev, NULL,
br_handle_frame_finish, 1); br_handle_frame_finish, 1);
return 0; return 0;
@ -596,7 +598,8 @@ static unsigned int br_nf_pre_routing_ipv6(const struct nf_hook_ops *ops,
return NF_DROP; return NF_DROP;
skb->protocol = htons(ETH_P_IPV6); skb->protocol = htons(ETH_P_IPV6);
NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING, skb, skb->dev, NULL, NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING, state->sk, skb,
skb->dev, NULL,
br_nf_pre_routing_finish_ipv6); br_nf_pre_routing_finish_ipv6);
return NF_STOLEN; return NF_STOLEN;
@ -651,7 +654,8 @@ static unsigned int br_nf_pre_routing(const struct nf_hook_ops *ops,
skb->protocol = htons(ETH_P_IP); skb->protocol = htons(ETH_P_IP);
NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, skb, skb->dev, NULL, NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, state->sk, skb,
skb->dev, NULL,
br_nf_pre_routing_finish); br_nf_pre_routing_finish);
return NF_STOLEN; return NF_STOLEN;
@ -674,7 +678,7 @@ static unsigned int br_nf_local_in(const struct nf_hook_ops *ops,
} }
/* PF_BRIDGE/FORWARD *************************************************/ /* PF_BRIDGE/FORWARD *************************************************/
static int br_nf_forward_finish(struct sk_buff *skb) static int br_nf_forward_finish(struct sock *sk, struct sk_buff *skb)
{ {
struct nf_bridge_info *nf_bridge = skb->nf_bridge; struct nf_bridge_info *nf_bridge = skb->nf_bridge;
struct net_device *in; struct net_device *in;
@ -691,8 +695,8 @@ static int br_nf_forward_finish(struct sk_buff *skb)
} }
nf_bridge_push_encap_header(skb); nf_bridge_push_encap_header(skb);
NF_HOOK_THRESH(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, in, NF_HOOK_THRESH(NFPROTO_BRIDGE, NF_BR_FORWARD, sk, skb,
skb->dev, br_forward_finish, 1); in, skb->dev, br_forward_finish, 1);
return 0; return 0;
} }
@ -746,7 +750,8 @@ static unsigned int br_nf_forward_ip(const struct nf_hook_ops *ops,
else else
skb->protocol = htons(ETH_P_IPV6); skb->protocol = htons(ETH_P_IPV6);
NF_HOOK(pf, NF_INET_FORWARD, skb, brnf_get_logical_dev(skb, state->in), NF_HOOK(pf, NF_INET_FORWARD, NULL, skb,
brnf_get_logical_dev(skb, state->in),
parent, br_nf_forward_finish); parent, br_nf_forward_finish);
return NF_STOLEN; return NF_STOLEN;
@ -780,8 +785,8 @@ static unsigned int br_nf_forward_arp(const struct nf_hook_ops *ops,
return NF_ACCEPT; return NF_ACCEPT;
} }
*d = state->in; *d = state->in;
NF_HOOK(NFPROTO_ARP, NF_ARP_FORWARD, skb, state->in, NF_HOOK(NFPROTO_ARP, NF_ARP_FORWARD, state->sk, skb,
state->out, br_nf_forward_finish); state->in, state->out, br_nf_forward_finish);
return NF_STOLEN; return NF_STOLEN;
} }
@ -804,24 +809,24 @@ static bool nf_bridge_copy_header(struct sk_buff *skb)
return true; return true;
} }
static int br_nf_push_frag_xmit(struct sk_buff *skb) static int br_nf_push_frag_xmit(struct sock *sk, struct sk_buff *skb)
{ {
if (!nf_bridge_copy_header(skb)) { if (!nf_bridge_copy_header(skb)) {
kfree_skb(skb); kfree_skb(skb);
return 0; return 0;
} }
return br_dev_queue_push_xmit(skb); return br_dev_queue_push_xmit(sk, skb);
} }
static int br_nf_dev_queue_xmit(struct sk_buff *skb) static int br_nf_dev_queue_xmit(struct sock *sk, struct sk_buff *skb)
{ {
int ret; int ret;
int frag_max_size; int frag_max_size;
unsigned int mtu_reserved; unsigned int mtu_reserved;
if (skb_is_gso(skb) || skb->protocol != htons(ETH_P_IP)) if (skb_is_gso(skb) || skb->protocol != htons(ETH_P_IP))
return br_dev_queue_push_xmit(skb); return br_dev_queue_push_xmit(sk, skb);
mtu_reserved = nf_bridge_mtu_reduction(skb); mtu_reserved = nf_bridge_mtu_reduction(skb);
/* This is wrong! We should preserve the original fragment /* This is wrong! We should preserve the original fragment
@ -833,16 +838,16 @@ static int br_nf_dev_queue_xmit(struct sk_buff *skb)
/* Drop invalid packet */ /* Drop invalid packet */
return NF_DROP; return NF_DROP;
IPCB(skb)->frag_max_size = frag_max_size; IPCB(skb)->frag_max_size = frag_max_size;
ret = ip_fragment(skb, br_nf_push_frag_xmit); ret = ip_fragment(sk, skb, br_nf_push_frag_xmit);
} else } else
ret = br_dev_queue_push_xmit(skb); ret = br_dev_queue_push_xmit(sk, skb);
return ret; return ret;
} }
#else #else
static int br_nf_dev_queue_xmit(struct sk_buff *skb) static int br_nf_dev_queue_xmit(struct sock *sk, struct sk_buff *skb)
{ {
return br_dev_queue_push_xmit(skb); return br_dev_queue_push_xmit(sk, skb);
} }
#endif #endif
@ -887,7 +892,8 @@ static unsigned int br_nf_post_routing(const struct nf_hook_ops *ops,
else else
skb->protocol = htons(ETH_P_IPV6); skb->protocol = htons(ETH_P_IPV6);
NF_HOOK(pf, NF_INET_POST_ROUTING, skb, NULL, realoutdev, NF_HOOK(pf, NF_INET_POST_ROUTING, state->sk, skb,
NULL, realoutdev,
br_nf_dev_queue_xmit); br_nf_dev_queue_xmit);
return NF_STOLEN; return NF_STOLEN;
@ -927,7 +933,7 @@ static void br_nf_pre_routing_finish_bridge_slow(struct sk_buff *skb)
skb_copy_to_linear_data_offset(skb, -(ETH_HLEN-ETH_ALEN), skb_copy_to_linear_data_offset(skb, -(ETH_HLEN-ETH_ALEN),
skb->nf_bridge->data, ETH_HLEN-ETH_ALEN); skb->nf_bridge->data, ETH_HLEN-ETH_ALEN);
skb->dev = nf_bridge->physindev; skb->dev = nf_bridge->physindev;
br_handle_frame_finish(skb); br_handle_frame_finish(NULL, skb);
} }
static int br_nf_dev_xmit(struct sk_buff *skb) static int br_nf_dev_xmit(struct sk_buff *skb)

6
net/bridge/br_private.h
View File

@ -410,10 +410,10 @@ int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,
/* br_forward.c */ /* br_forward.c */
void br_deliver(const struct net_bridge_port *to, struct sk_buff *skb); void br_deliver(const struct net_bridge_port *to, struct sk_buff *skb);
int br_dev_queue_push_xmit(struct sk_buff *skb); int br_dev_queue_push_xmit(struct sock *sk, struct sk_buff *skb);
void br_forward(const struct net_bridge_port *to, void br_forward(const struct net_bridge_port *to,
struct sk_buff *skb, struct sk_buff *skb0); struct sk_buff *skb, struct sk_buff *skb0);
int br_forward_finish(struct sk_buff *skb); int br_forward_finish(struct sock *sk, struct sk_buff *skb);
void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb, bool unicast); void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb, bool unicast);
void br_flood_forward(struct net_bridge *br, struct sk_buff *skb, void br_flood_forward(struct net_bridge *br, struct sk_buff *skb,
struct sk_buff *skb2, bool unicast); struct sk_buff *skb2, bool unicast);
@ -431,7 +431,7 @@ void br_port_flags_change(struct net_bridge_port *port, unsigned long mask);
void br_manage_promisc(struct net_bridge *br); void br_manage_promisc(struct net_bridge *br);
/* br_input.c */ /* br_input.c */
int br_handle_frame_finish(struct sk_buff *skb); int br_handle_frame_finish(struct sock *sk, struct sk_buff *skb);
rx_handler_result_t br_handle_frame(struct sk_buff **pskb); rx_handler_result_t br_handle_frame(struct sk_buff **pskb);
static inline bool br_rx_handler_check_rcu(const struct net_device *dev) static inline bool br_rx_handler_check_rcu(const struct net_device *dev)

5
net/bridge/br_stp_bpdu.c
View File

@ -54,8 +54,9 @@ static void br_send_bpdu(struct net_bridge_port *p,
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, NULL, skb,
dev_queue_xmit); NULL, skb->dev,
dev_queue_xmit_sk);
} }
static inline void br_set_ticks(unsigned char *dest, int j) static inline void br_set_ticks(unsigned char *dest, int j)

10
net/core/dev.c
View File

@ -2879,7 +2879,7 @@ EXPORT_SYMBOL(xmit_recursion);
* dev_loopback_xmit - loop back @skb * dev_loopback_xmit - loop back @skb
* @skb: buffer to transmit * @skb: buffer to transmit
*/ */
int dev_loopback_xmit(struct sk_buff *skb) int dev_loopback_xmit(struct sock *sk, struct sk_buff *skb)
{ {
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
__skb_pull(skb, skb_network_offset(skb)); __skb_pull(skb, skb_network_offset(skb));
@ -3017,11 +3017,11 @@ out:
return rc; return rc;
} }
int dev_queue_xmit(struct sk_buff *skb) int dev_queue_xmit_sk(struct sock *sk, struct sk_buff *skb)
{ {
return __dev_queue_xmit(skb, NULL); return __dev_queue_xmit(skb, NULL);
} }
EXPORT_SYMBOL(dev_queue_xmit); EXPORT_SYMBOL(dev_queue_xmit_sk);
int dev_queue_xmit_accel(struct sk_buff *skb, void *accel_priv) int dev_queue_xmit_accel(struct sk_buff *skb, void *accel_priv)
{ {
@ -3853,13 +3853,13 @@ static int netif_receive_skb_internal(struct sk_buff *skb)
* NET_RX_SUCCESS: no congestion * NET_RX_SUCCESS: no congestion
* NET_RX_DROP: packet was dropped * NET_RX_DROP: packet was dropped
*/ */
int netif_receive_skb(struct sk_buff *skb) int netif_receive_skb_sk(struct sock *sk, struct sk_buff *skb)
{ {
trace_netif_receive_skb_entry(skb); trace_netif_receive_skb_entry(skb);
return netif_receive_skb_internal(skb); return netif_receive_skb_internal(skb);
} }
EXPORT_SYMBOL(netif_receive_skb); EXPORT_SYMBOL(netif_receive_skb_sk);
/* Network device is going away, flush any packets still pending /* Network device is going away, flush any packets still pending
* Called with irqs disabled. * Called with irqs disabled.

35
net/decnet/dn_neigh.c
View File

@ -194,7 +194,7 @@ static int dn_neigh_output(struct neighbour *neigh, struct sk_buff *skb)
return err; return err;
} }
static int dn_neigh_output_packet(struct sk_buff *skb) static int dn_neigh_output_packet(struct sock *sk, struct sk_buff *skb)
{ {
struct dst_entry *dst = skb_dst(skb); struct dst_entry *dst = skb_dst(skb);
struct dn_route *rt = (struct dn_route *)dst; struct dn_route *rt = (struct dn_route *)dst;
@ -206,7 +206,8 @@ static int dn_neigh_output_packet(struct sk_buff *skb)
/* /*
* For talking to broadcast devices: Ethernet & PPP * For talking to broadcast devices: Ethernet & PPP
*/ */
static int dn_long_output(struct neighbour *neigh, struct sk_buff *skb) static int dn_long_output(struct neighbour *neigh, struct sock *sk,
struct sk_buff *skb)
{ {
struct net_device *dev = neigh->dev; struct net_device *dev = neigh->dev;
int headroom = dev->hard_header_len + sizeof(struct dn_long_packet) + 3; int headroom = dev->hard_header_len + sizeof(struct dn_long_packet) + 3;
@ -245,14 +246,15 @@ static int dn_long_output(struct neighbour *neigh, struct sk_buff *skb)
skb_reset_network_header(skb); skb_reset_network_header(skb);
return NF_HOOK(NFPROTO_DECNET, NF_DN_POST_ROUTING, skb, NULL, return NF_HOOK(NFPROTO_DECNET, NF_DN_POST_ROUTING, sk, skb,
neigh->dev, dn_neigh_output_packet); NULL, neigh->dev, dn_neigh_output_packet);
} }
/* /*
* For talking to pointopoint and multidrop devices: DDCMP and X.25 * For talking to pointopoint and multidrop devices: DDCMP and X.25
*/ */
static int dn_short_output(struct neighbour *neigh, struct sk_buff *skb) static int dn_short_output(struct neighbour *neigh, struct sock *sk,
struct sk_buff *skb)
{ {
struct net_device *dev = neigh->dev; struct net_device *dev = neigh->dev;
int headroom = dev->hard_header_len + sizeof(struct dn_short_packet) + 2; int headroom = dev->hard_header_len + sizeof(struct dn_short_packet) + 2;
@ -284,8 +286,8 @@ static int dn_short_output(struct neighbour *neigh, struct sk_buff *skb)
skb_reset_network_header(skb); skb_reset_network_header(skb);
return NF_HOOK(NFPROTO_DECNET, NF_DN_POST_ROUTING, skb, NULL, return NF_HOOK(NFPROTO_DECNET, NF_DN_POST_ROUTING, sk, skb,
neigh->dev, dn_neigh_output_packet); NULL, neigh->dev, dn_neigh_output_packet);
} }
/* /*
@ -293,7 +295,8 @@ static int dn_short_output(struct neighbour *neigh, struct sk_buff *skb)
* Phase 3 output is the same as short output, execpt that * Phase 3 output is the same as short output, execpt that
* it clears the area bits before transmission. * it clears the area bits before transmission.
*/ */
static int dn_phase3_output(struct neighbour *neigh, struct sk_buff *skb) static int dn_phase3_output(struct neighbour *neigh, struct sock *sk,
struct sk_buff *skb)
{ {
struct net_device *dev = neigh->dev; struct net_device *dev = neigh->dev;
int headroom = dev->hard_header_len + sizeof(struct dn_short_packet) + 2; int headroom = dev->hard_header_len + sizeof(struct dn_short_packet) + 2;
@ -324,11 +327,11 @@ static int dn_phase3_output(struct neighbour *neigh, struct sk_buff *skb)
skb_reset_network_header(skb); skb_reset_network_header(skb);
return NF_HOOK(NFPROTO_DECNET, NF_DN_POST_ROUTING, skb, NULL, return NF_HOOK(NFPROTO_DECNET, NF_DN_POST_ROUTING, sk, skb,
neigh->dev, dn_neigh_output_packet); NULL, neigh->dev, dn_neigh_output_packet);
} }
int dn_to_neigh_output(struct sk_buff *skb) int dn_to_neigh_output(struct sock *sk, struct sk_buff *skb)
{ {
struct dst_entry *dst = skb_dst(skb); struct dst_entry *dst = skb_dst(skb);
struct dn_route *rt = (struct dn_route *) dst; struct dn_route *rt = (struct dn_route *) dst;
@ -347,11 +350,11 @@ int dn_to_neigh_output(struct sk_buff *skb)
rcu_read_unlock(); rcu_read_unlock();
if (dn->flags & DN_NDFLAG_P3) if (dn->flags & DN_NDFLAG_P3)
return dn_phase3_output(neigh, skb); return dn_phase3_output(neigh, sk, skb);
if (use_long) if (use_long)
return dn_long_output(neigh, skb); return dn_long_output(neigh, sk, skb);
else else
return dn_short_output(neigh, skb); return dn_short_output(neigh, sk, skb);
} }
/* /*
@ -372,7 +375,7 @@ void dn_neigh_pointopoint_hello(struct sk_buff *skb)
/* /*
* Ethernet router hello message received * Ethernet router hello message received
*/ */
int dn_neigh_router_hello(struct sk_buff *skb) int dn_neigh_router_hello(struct sock *sk, struct sk_buff *skb)
{ {
struct rtnode_hello_message *msg = (struct rtnode_hello_message *)skb->data; struct rtnode_hello_message *msg = (struct rtnode_hello_message *)skb->data;
@ -434,7 +437,7 @@ int dn_neigh_router_hello(struct sk_buff *skb)
/* /*
* Endnode hello message received * Endnode hello message received
*/ */
int dn_neigh_endnode_hello(struct sk_buff *skb) int dn_neigh_endnode_hello(struct sock *sk, struct sk_buff *skb)
{ {
struct endnode_hello_message *msg = (struct endnode_hello_message *)skb->data; struct endnode_hello_message *msg = (struct endnode_hello_message *)skb->data;
struct neighbour *neigh; struct neighbour *neigh;

5
net/decnet/dn_nsp_in.c
View File

@ -714,7 +714,7 @@ out:
return ret; return ret;
} }
static int dn_nsp_rx_packet(struct sk_buff *skb) static int dn_nsp_rx_packet(struct sock *sk2, struct sk_buff *skb)
{ {
struct dn_skb_cb *cb = DN_SKB_CB(skb); struct dn_skb_cb *cb = DN_SKB_CB(skb);
struct sock *sk = NULL; struct sock *sk = NULL;
@ -814,7 +814,8 @@ free_out:
int dn_nsp_rx(struct sk_buff *skb) int dn_nsp_rx(struct sk_buff *skb)
{ {
return NF_HOOK(NFPROTO_DECNET, NF_DN_LOCAL_IN, skb, skb->dev, NULL, return NF_HOOK(NFPROTO_DECNET, NF_DN_LOCAL_IN, NULL, skb,
skb->dev, NULL,
dn_nsp_rx_packet); dn_nsp_rx_packet);
} }

26
net/decnet/dn_route.c
View File

@ -512,7 +512,7 @@ static int dn_return_long(struct sk_buff *skb)
* *
* Returns: result of input function if route is found, error code otherwise * Returns: result of input function if route is found, error code otherwise
*/ */
static int dn_route_rx_packet(struct sk_buff *skb) static int dn_route_rx_packet(struct sock *sk, struct sk_buff *skb)
{ {
struct dn_skb_cb *cb; struct dn_skb_cb *cb;
int err; int err;
@ -573,7 +573,8 @@ static int dn_route_rx_long(struct sk_buff *skb)
ptr++; ptr++;
cb->hops = *ptr++; /* Visit Count */ cb->hops = *ptr++; /* Visit Count */
return NF_HOOK(NFPROTO_DECNET, NF_DN_PRE_ROUTING, skb, skb->dev, NULL, return NF_HOOK(NFPROTO_DECNET, NF_DN_PRE_ROUTING, NULL, skb,
skb->dev, NULL,
dn_route_rx_packet); dn_route_rx_packet);
drop_it: drop_it:
@ -600,7 +601,8 @@ static int dn_route_rx_short(struct sk_buff *skb)
ptr += 2; ptr += 2;
cb->hops = *ptr & 0x3f; cb->hops = *ptr & 0x3f;
return NF_HOOK(NFPROTO_DECNET, NF_DN_PRE_ROUTING, skb, skb->dev, NULL, return NF_HOOK(NFPROTO_DECNET, NF_DN_PRE_ROUTING, NULL, skb,
skb->dev, NULL,
dn_route_rx_packet); dn_route_rx_packet);
drop_it: drop_it:
@ -608,7 +610,7 @@ drop_it:
return NET_RX_DROP; return NET_RX_DROP;
} }
static int dn_route_discard(struct sk_buff *skb) static int dn_route_discard(struct sock *sk, struct sk_buff *skb)
{ {
/* /*
* I know we drop the packet here, but thats considered success in * I know we drop the packet here, but thats considered success in
@ -618,7 +620,7 @@ static int dn_route_discard(struct sk_buff *skb)
return NET_RX_SUCCESS; return NET_RX_SUCCESS;
} }
static int dn_route_ptp_hello(struct sk_buff *skb) static int dn_route_ptp_hello(struct sock *sk, struct sk_buff *skb)
{ {
dn_dev_hello(skb); dn_dev_hello(skb);
dn_neigh_pointopoint_hello(skb); dn_neigh_pointopoint_hello(skb);
@ -704,22 +706,22 @@ int dn_route_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type
switch (flags & DN_RT_CNTL_MSK) { switch (flags & DN_RT_CNTL_MSK) {
case DN_RT_PKT_HELO: case DN_RT_PKT_HELO:
return NF_HOOK(NFPROTO_DECNET, NF_DN_HELLO, return NF_HOOK(NFPROTO_DECNET, NF_DN_HELLO,
skb, skb->dev, NULL, NULL, skb, skb->dev, NULL,
dn_route_ptp_hello); dn_route_ptp_hello);
case DN_RT_PKT_L1RT: case DN_RT_PKT_L1RT:
case DN_RT_PKT_L2RT: case DN_RT_PKT_L2RT:
return NF_HOOK(NFPROTO_DECNET, NF_DN_ROUTE, return NF_HOOK(NFPROTO_DECNET, NF_DN_ROUTE,
skb, skb->dev, NULL, NULL, skb, skb->dev, NULL,
dn_route_discard); dn_route_discard);
case DN_RT_PKT_ERTH: case DN_RT_PKT_ERTH:
return NF_HOOK(NFPROTO_DECNET, NF_DN_HELLO, return NF_HOOK(NFPROTO_DECNET, NF_DN_HELLO,
skb, skb->dev, NULL, NULL, skb, skb->dev, NULL,
dn_neigh_router_hello); dn_neigh_router_hello);
case DN_RT_PKT_EEDH: case DN_RT_PKT_EEDH:
return NF_HOOK(NFPROTO_DECNET, NF_DN_HELLO, return NF_HOOK(NFPROTO_DECNET, NF_DN_HELLO,
skb, skb->dev, NULL, NULL, skb, skb->dev, NULL,
dn_neigh_endnode_hello); dn_neigh_endnode_hello);
} }
} else { } else {
@ -768,7 +770,8 @@ static int dn_output(struct sock *sk, struct sk_buff *skb)
cb->rt_flags |= DN_RT_F_IE; cb->rt_flags |= DN_RT_F_IE;
cb->hops = 0; cb->hops = 0;
return NF_HOOK(NFPROTO_DECNET, NF_DN_LOCAL_OUT, skb, NULL, dev, return NF_HOOK(NFPROTO_DECNET, NF_DN_LOCAL_OUT, sk, skb,
NULL, dev,
dn_to_neigh_output); dn_to_neigh_output);
error: error:
@ -816,7 +819,8 @@ static int dn_forward(struct sk_buff *skb)
if (rt->rt_flags & RTCF_DOREDIRECT) if (rt->rt_flags & RTCF_DOREDIRECT)
cb->rt_flags |= DN_RT_F_IE; cb->rt_flags |= DN_RT_F_IE;
return NF_HOOK(NFPROTO_DECNET, NF_DN_FORWARD, skb, dev, skb->dev, return NF_HOOK(NFPROTO_DECNET, NF_DN_FORWARD, NULL, skb,
dev, skb->dev,
dn_to_neigh_output); dn_to_neigh_output);
drop: drop:

10
net/ipv4/arp.c
View File

@ -591,7 +591,8 @@ EXPORT_SYMBOL(arp_create);
void arp_xmit(struct sk_buff *skb) void arp_xmit(struct sk_buff *skb)
{ {
/* Send it off, maybe filter it using firewalling first. */ /* Send it off, maybe filter it using firewalling first. */
NF_HOOK(NFPROTO_ARP, NF_ARP_OUT, skb, NULL, skb->dev, dev_queue_xmit); NF_HOOK(NFPROTO_ARP, NF_ARP_OUT, NULL, skb,
NULL, skb->dev, dev_queue_xmit_sk);
} }
EXPORT_SYMBOL(arp_xmit); EXPORT_SYMBOL(arp_xmit);
@ -625,7 +626,7 @@ EXPORT_SYMBOL(arp_send);
* Process an arp request. * Process an arp request.
*/ */
static int arp_process(struct sk_buff *skb) static int arp_process(struct sock *sk, struct sk_buff *skb)
{ {
struct net_device *dev = skb->dev; struct net_device *dev = skb->dev;
struct in_device *in_dev = __in_dev_get_rcu(dev); struct in_device *in_dev = __in_dev_get_rcu(dev);
@ -846,7 +847,7 @@ out:
static void parp_redo(struct sk_buff *skb) static void parp_redo(struct sk_buff *skb)
{ {
arp_process(skb); arp_process(NULL, skb);
} }
@ -879,7 +880,8 @@ static int arp_rcv(struct sk_buff *skb, struct net_device *dev,
memset(NEIGH_CB(skb), 0, sizeof(struct neighbour_cb)); memset(NEIGH_CB(skb), 0, sizeof(struct neighbour_cb));
return NF_HOOK(NFPROTO_ARP, NF_ARP_IN, skb, dev, NULL, arp_process); return NF_HOOK(NFPROTO_ARP, NF_ARP_IN, NULL, skb,
dev, NULL, arp_process);
consumeskb: consumeskb:
consume_skb(skb); consume_skb(skb);

2
net/ipv4/geneve.c
View File

@ -136,7 +136,7 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt,
skb_set_inner_protocol(skb, htons(ETH_P_TEB)); skb_set_inner_protocol(skb, htons(ETH_P_TEB));
return udp_tunnel_xmit_skb(rt, skb, src, dst, return udp_tunnel_xmit_skb(rt, gs->sock->sk, skb, src, dst,
tos, ttl, df, src_port, dst_port, xnet, tos, ttl, df, src_port, dst_port, xnet,
!csum); !csum);
} }

8
net/ipv4/ip_forward.c
View File

@ -57,7 +57,7 @@ static bool ip_exceeds_mtu(const struct sk_buff *skb, unsigned int mtu)
} }
static int ip_forward_finish(struct sk_buff *skb) static int ip_forward_finish(struct sock *sk, struct sk_buff *skb)
{ {
struct ip_options *opt = &(IPCB(skb)->opt); struct ip_options *opt = &(IPCB(skb)->opt);
@ -68,7 +68,7 @@ static int ip_forward_finish(struct sk_buff *skb)
ip_forward_options(skb); ip_forward_options(skb);
skb_sender_cpu_clear(skb); skb_sender_cpu_clear(skb);
return dst_output(skb); return dst_output_sk(sk, skb);
} }
int ip_forward(struct sk_buff *skb) int ip_forward(struct sk_buff *skb)
@ -136,8 +136,8 @@ int ip_forward(struct sk_buff *skb)
skb->priority = rt_tos2priority(iph->tos); skb->priority = rt_tos2priority(iph->tos);
return NF_HOOK(NFPROTO_IPV4, NF_INET_FORWARD, skb, skb->dev, return NF_HOOK(NFPROTO_IPV4, NF_INET_FORWARD, NULL, skb,
rt->dst.dev, ip_forward_finish); skb->dev, rt->dst.dev, ip_forward_finish);
sr_failed: sr_failed:
/* /*

10
net/ipv4/ip_input.c
View File

@ -187,7 +187,7 @@ bool ip_call_ra_chain(struct sk_buff *skb)
return false; return false;
} }
static int ip_local_deliver_finish(struct sk_buff *skb) static int ip_local_deliver_finish(struct sock *sk, struct sk_buff *skb)
{ {
struct net *net = dev_net(skb->dev); struct net *net = dev_net(skb->dev);
@ -253,7 +253,8 @@ int ip_local_deliver(struct sk_buff *skb)
return 0; return 0;
} }
return NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_IN, skb, skb->dev, NULL, return NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_IN, NULL, skb,
skb->dev, NULL,
ip_local_deliver_finish); ip_local_deliver_finish);
} }
@ -309,7 +310,7 @@ drop:
int sysctl_ip_early_demux __read_mostly = 1; int sysctl_ip_early_demux __read_mostly = 1;
EXPORT_SYMBOL(sysctl_ip_early_demux); EXPORT_SYMBOL(sysctl_ip_early_demux);
static int ip_rcv_finish(struct sk_buff *skb) static int ip_rcv_finish(struct sock *sk, struct sk_buff *skb)
{ {
const struct iphdr *iph = ip_hdr(skb); const struct iphdr *iph = ip_hdr(skb);
struct rtable *rt; struct rtable *rt;
@ -451,7 +452,8 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
/* Must drop socket now because of tproxy. */ /* Must drop socket now because of tproxy. */
skb_orphan(skb); skb_orphan(skb);
return NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, skb, dev, NULL, return NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, NULL, skb,
dev, NULL,
ip_rcv_finish); ip_rcv_finish);
csum_error: csum_error:

45
net/ipv4/ip_output.c
View File

@ -91,14 +91,19 @@ void ip_send_check(struct iphdr *iph)
} }
EXPORT_SYMBOL(ip_send_check); EXPORT_SYMBOL(ip_send_check);
int __ip_local_out(struct sk_buff *skb) int __ip_local_out_sk(struct sock *sk, struct sk_buff *skb)
{ {
struct iphdr *iph = ip_hdr(skb); struct iphdr *iph = ip_hdr(skb);
iph->tot_len = htons(skb->len); iph->tot_len = htons(skb->len);
ip_send_check(iph); ip_send_check(iph);
return nf_hook(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL, return nf_hook(NFPROTO_IPV4, NF_INET_LOCAL_OUT, sk, skb, NULL,
skb_dst(skb)->dev, dst_output); skb_dst(skb)->dev, dst_output_sk);
}
int __ip_local_out(struct sk_buff *skb)
{
return __ip_local_out_sk(skb->sk, skb);
} }
int ip_local_out_sk(struct sock *sk, struct sk_buff *skb) int ip_local_out_sk(struct sock *sk, struct sk_buff *skb)
@ -163,7 +168,7 @@ int ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk,
} }
EXPORT_SYMBOL_GPL(ip_build_and_send_pkt); EXPORT_SYMBOL_GPL(ip_build_and_send_pkt);
static inline int ip_finish_output2(struct sk_buff *skb) static inline int ip_finish_output2(struct sock *sk, struct sk_buff *skb)
{ {
struct dst_entry *dst = skb_dst(skb); struct dst_entry *dst = skb_dst(skb);
struct rtable *rt = (struct rtable *)dst; struct rtable *rt = (struct rtable *)dst;
@ -211,7 +216,7 @@ static inline int ip_finish_output2(struct sk_buff *skb)
return -EINVAL; return -EINVAL;
} }
static int ip_finish_output_gso(struct sk_buff *skb) static int ip_finish_output_gso(struct sock *sk, struct sk_buff *skb)
{ {
netdev_features_t features; netdev_features_t features;
struct sk_buff *segs; struct sk_buff *segs;
@ -220,7 +225,7 @@ static int ip_finish_output_gso(struct sk_buff *skb)
/* common case: locally created skb or seglen is <= mtu */ /* common case: locally created skb or seglen is <= mtu */
if (((IPCB(skb)->flags & IPSKB_FORWARDED) == 0) || if (((IPCB(skb)->flags & IPSKB_FORWARDED) == 0) ||
skb_gso_network_seglen(skb) <= ip_skb_dst_mtu(skb)) skb_gso_network_seglen(skb) <= ip_skb_dst_mtu(skb))
return ip_finish_output2(skb); return ip_finish_output2(sk, skb);
/* Slowpath - GSO segment length is exceeding the dst MTU. /* Slowpath - GSO segment length is exceeding the dst MTU.
* *
@ -243,7 +248,7 @@ static int ip_finish_output_gso(struct sk_buff *skb)
int err; int err;
segs->next = NULL; segs->next = NULL;
err = ip_fragment(segs, ip_finish_output2); err = ip_fragment(sk, segs, ip_finish_output2);
if (err && ret == 0) if (err && ret == 0)
ret = err; ret = err;
@ -253,22 +258,22 @@ static int ip_finish_output_gso(struct sk_buff *skb)
return ret; return ret;
} }
static int ip_finish_output(struct sk_buff *skb) static int ip_finish_output(struct sock *sk, struct sk_buff *skb)
{ {
#if defined(CONFIG_NETFILTER) && defined(CONFIG_XFRM) #if defined(CONFIG_NETFILTER) && defined(CONFIG_XFRM)
/* Policy lookup after SNAT yielded a new policy */ /* Policy lookup after SNAT yielded a new policy */
if (skb_dst(skb)->xfrm) { if (skb_dst(skb)->xfrm) {
IPCB(skb)->flags |= IPSKB_REROUTED; IPCB(skb)->flags |= IPSKB_REROUTED;
return dst_output(skb); return dst_output_sk(sk, skb);
} }
#endif #endif
if (skb_is_gso(skb)) if (skb_is_gso(skb))
return ip_finish_output_gso(skb); return ip_finish_output_gso(sk, skb);
if (skb->len > ip_skb_dst_mtu(skb)) if (skb->len > ip_skb_dst_mtu(skb))
return ip_fragment(skb, ip_finish_output2); return ip_fragment(sk, skb, ip_finish_output2);
return ip_finish_output2(skb); return ip_finish_output2(sk, skb);
} }
int ip_mc_output(struct sock *sk, struct sk_buff *skb) int ip_mc_output(struct sock *sk, struct sk_buff *skb)
@ -307,7 +312,7 @@ int ip_mc_output(struct sock *sk, struct sk_buff *skb)
struct sk_buff *newskb = skb_clone(skb, GFP_ATOMIC); struct sk_buff *newskb = skb_clone(skb, GFP_ATOMIC);
if (newskb) if (newskb)
NF_HOOK(NFPROTO_IPV4, NF_INET_POST_ROUTING, NF_HOOK(NFPROTO_IPV4, NF_INET_POST_ROUTING,
newskb, NULL, newskb->dev, sk, newskb, NULL, newskb->dev,
dev_loopback_xmit); dev_loopback_xmit);
} }
@ -322,11 +327,11 @@ int ip_mc_output(struct sock *sk, struct sk_buff *skb)
if (rt->rt_flags&RTCF_BROADCAST) { if (rt->rt_flags&RTCF_BROADCAST) {
struct sk_buff *newskb = skb_clone(skb, GFP_ATOMIC); struct sk_buff *newskb = skb_clone(skb, GFP_ATOMIC);
if (newskb) if (newskb)
NF_HOOK(NFPROTO_IPV4, NF_INET_POST_ROUTING, newskb, NF_HOOK(NFPROTO_IPV4, NF_INET_POST_ROUTING, sk, newskb,
NULL, newskb->dev, dev_loopback_xmit); NULL, newskb->dev, dev_loopback_xmit);
} }
return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING, skb, NULL, return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING, sk, skb, NULL,
skb->dev, ip_finish_output, skb->dev, ip_finish_output,
!(IPCB(skb)->flags & IPSKB_REROUTED)); !(IPCB(skb)->flags & IPSKB_REROUTED));
} }
@ -340,7 +345,8 @@ int ip_output(struct sock *sk, struct sk_buff *skb)
skb->dev = dev; skb->dev = dev;
skb->protocol = htons(ETH_P_IP); skb->protocol = htons(ETH_P_IP);
return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING, skb, NULL, dev, return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING, sk, skb,
NULL, dev,
ip_finish_output, ip_finish_output,
!(IPCB(skb)->flags & IPSKB_REROUTED)); !(IPCB(skb)->flags & IPSKB_REROUTED));
} }
@ -480,7 +486,8 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)
* single device frame, and queue such a frame for sending. * single device frame, and queue such a frame for sending.
*/ */
int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) int ip_fragment(struct sock *sk, struct sk_buff *skb,
int (*output)(struct sock *, struct sk_buff *))
{ {
struct iphdr *iph; struct iphdr *iph;
int ptr; int ptr;
@ -593,7 +600,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
ip_send_check(iph); ip_send_check(iph);
} }
err = output(skb); err = output(sk, skb);
if (!err) if (!err)
IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGCREATES); IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGCREATES);
@ -730,7 +737,7 @@ slow_path:
ip_send_check(iph); ip_send_check(iph);
err = output(skb2); err = output(sk, skb2);
if (err) if (err)
goto fail; goto fail;

2
net/ipv4/ip_tunnel.c
View File

@ -782,7 +782,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
return; return;
} }
err = iptunnel_xmit(skb->sk, rt, skb, fl4.saddr, fl4.daddr, protocol, err = iptunnel_xmit(NULL, rt, skb, fl4.saddr, fl4.daddr, protocol,
tos, ttl, df, !net_eq(tunnel->net, dev_net(dev))); tos, ttl, df, !net_eq(tunnel->net, dev_net(dev)));
iptunnel_xmit_stats(err, &dev->stats, dev->tstats); iptunnel_xmit_stats(err, &dev->stats, dev->tstats);

7
net/ipv4/ipmr.c
View File

@ -1679,7 +1679,7 @@ static void ip_encap(struct net *net, struct sk_buff *skb,
nf_reset(skb); nf_reset(skb);
} }
static inline int ipmr_forward_finish(struct sk_buff *skb) static inline int ipmr_forward_finish(struct sock *sk, struct sk_buff *skb)
{ {
struct ip_options *opt = &(IPCB(skb)->opt); struct ip_options *opt = &(IPCB(skb)->opt);
@ -1689,7 +1689,7 @@ static inline int ipmr_forward_finish(struct sk_buff *skb)
if (unlikely(opt->optlen)) if (unlikely(opt->optlen))
ip_forward_options(skb); ip_forward_options(skb);
return dst_output(skb); return dst_output_sk(sk, skb);
} }
/* /*
@ -1788,7 +1788,8 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,
* not mrouter) cannot join to more than one interface - it will * not mrouter) cannot join to more than one interface - it will
* result in receiving multiple packets. * result in receiving multiple packets.
*/ */
NF_HOOK(NFPROTO_IPV4, NF_INET_FORWARD, skb, skb->dev, dev, NF_HOOK(NFPROTO_IPV4, NF_INET_FORWARD, NULL, skb,
skb->dev, dev,
ipmr_forward_finish); ipmr_forward_finish);
return; return;

4
net/ipv4/raw.c
View File

@ -412,8 +412,8 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4,
icmp_out_count(net, ((struct icmphdr *) icmp_out_count(net, ((struct icmphdr *)
skb_transport_header(skb))->type); skb_transport_header(skb))->type);
err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL, err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, sk, skb,
rt->dst.dev, dst_output); NULL, rt->dst.dev, dst_output_sk);
if (err > 0) if (err > 0)
err = net_xmit_errno(err); err = net_xmit_errno(err);
if (err) if (err)

4
net/ipv4/udp_tunnel.c
View File

@ -75,7 +75,7 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock,
} }
EXPORT_SYMBOL_GPL(setup_udp_tunnel_sock); EXPORT_SYMBOL_GPL(setup_udp_tunnel_sock);
int udp_tunnel_xmit_skb(struct rtable *rt, struct sk_buff *skb, int udp_tunnel_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb,
__be32 src, __be32 dst, __u8 tos, __u8 ttl, __be32 src, __be32 dst, __u8 tos, __u8 ttl,
__be16 df, __be16 src_port, __be16 dst_port, __be16 df, __be16 src_port, __be16 dst_port,
bool xnet, bool nocheck) bool xnet, bool nocheck)
@ -92,7 +92,7 @@ int udp_tunnel_xmit_skb(struct rtable *rt, struct sk_buff *skb,
udp_set_csum(nocheck, skb, src, dst, skb->len); udp_set_csum(nocheck, skb, src, dst, skb->len);
return iptunnel_xmit(skb->sk, rt, skb, src, dst, IPPROTO_UDP, return iptunnel_xmit(sk, rt, skb, src, dst, IPPROTO_UDP,
tos, ttl, df, xnet); tos, ttl, df, xnet);
} }
EXPORT_SYMBOL_GPL(udp_tunnel_xmit_skb); EXPORT_SYMBOL_GPL(udp_tunnel_xmit_skb);

5
net/ipv4/xfrm4_input.c
View File

@ -22,7 +22,7 @@ int xfrm4_extract_input(struct xfrm_state *x, struct sk_buff *skb)
return xfrm4_extract_header(skb); return xfrm4_extract_header(skb);
} }
static inline int xfrm4_rcv_encap_finish(struct sk_buff *skb) static inline int xfrm4_rcv_encap_finish(struct sock *sk, struct sk_buff *skb)
{ {
if (!skb_dst(skb)) { if (!skb_dst(skb)) {
const struct iphdr *iph = ip_hdr(skb); const struct iphdr *iph = ip_hdr(skb);
@ -52,7 +52,8 @@ int xfrm4_transport_finish(struct sk_buff *skb, int async)
iph->tot_len = htons(skb->len); iph->tot_len = htons(skb->len);
ip_send_check(iph); ip_send_check(iph);
NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, skb, skb->dev, NULL, NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, NULL, skb,
skb->dev, NULL,
xfrm4_rcv_encap_finish); xfrm4_rcv_encap_finish);
return 0; return 0;
} }

12
net/ipv4/xfrm4_output.c
View File

@ -69,7 +69,7 @@ int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb)
} }
EXPORT_SYMBOL(xfrm4_prepare_output); EXPORT_SYMBOL(xfrm4_prepare_output);
int xfrm4_output_finish(struct sk_buff *skb) int xfrm4_output_finish(struct sock *sk, struct sk_buff *skb)
{ {
memset(IPCB(skb), 0, sizeof(*IPCB(skb))); memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
@ -77,26 +77,26 @@ int xfrm4_output_finish(struct sk_buff *skb)
IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED; IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED;
#endif #endif
return xfrm_output(skb); return xfrm_output(sk, skb);
} }
static int __xfrm4_output(struct sk_buff *skb) static int __xfrm4_output(struct sock *sk, struct sk_buff *skb)
{ {
struct xfrm_state *x = skb_dst(skb)->xfrm; struct xfrm_state *x = skb_dst(skb)->xfrm;
#ifdef CONFIG_NETFILTER #ifdef CONFIG_NETFILTER
if (!x) { if (!x) {
IPCB(skb)->flags |= IPSKB_REROUTED; IPCB(skb)->flags |= IPSKB_REROUTED;
return dst_output(skb); return dst_output_sk(sk, skb);
} }
#endif #endif
return x->outer_mode->afinfo->output_finish(skb); return x->outer_mode->afinfo->output_finish(sk, skb);
} }
int xfrm4_output(struct sock *sk, struct sk_buff *skb) int xfrm4_output(struct sock *sk, struct sk_buff *skb)
{ {
return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING, skb, return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING, sk, skb,
NULL, skb_dst(skb)->dev, __xfrm4_output, NULL, skb_dst(skb)->dev, __xfrm4_output,
!(IPCB(skb)->flags & IPSKB_REROUTED)); !(IPCB(skb)->flags & IPSKB_REROUTED));
} }

2
net/ipv6/ip6_gre.c
View File

@ -760,7 +760,7 @@ static netdev_tx_t ip6gre_xmit2(struct sk_buff *skb,
skb_set_inner_protocol(skb, protocol); skb_set_inner_protocol(skb, protocol);
ip6tunnel_xmit(skb, dev); ip6tunnel_xmit(NULL, skb, dev);
if (ndst) if (ndst)
ip6_tnl_dst_store(tunnel, ndst); ip6_tnl_dst_store(tunnel, ndst);
return 0; return 0;

11
net/ipv6/ip6_input.c
View File

@ -46,8 +46,7 @@
#include <net/xfrm.h> #include <net/xfrm.h>
#include <net/inet_ecn.h> #include <net/inet_ecn.h>
int ip6_rcv_finish(struct sock *sk, struct sk_buff *skb)
int ip6_rcv_finish(struct sk_buff *skb)
{ {
if (sysctl_ip_early_demux && !skb_dst(skb) && skb->sk == NULL) { if (sysctl_ip_early_demux && !skb_dst(skb) && skb->sk == NULL) {
const struct inet6_protocol *ipprot; const struct inet6_protocol *ipprot;
@ -183,7 +182,8 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
/* Must drop socket now because of tproxy. */ /* Must drop socket now because of tproxy. */
skb_orphan(skb); skb_orphan(skb);
return NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING, skb, dev, NULL, return NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING, NULL, skb,
dev, NULL,
ip6_rcv_finish); ip6_rcv_finish);
err: err:
IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INHDRERRORS); IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INHDRERRORS);
@ -198,7 +198,7 @@ drop:
*/ */
static int ip6_input_finish(struct sk_buff *skb) static int ip6_input_finish(struct sock *sk, struct sk_buff *skb)
{ {
struct net *net = dev_net(skb_dst(skb)->dev); struct net *net = dev_net(skb_dst(skb)->dev);
const struct inet6_protocol *ipprot; const struct inet6_protocol *ipprot;
@ -277,7 +277,8 @@ discard:
int ip6_input(struct sk_buff *skb) int ip6_input(struct sk_buff *skb)
{ {
return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_IN, skb, skb->dev, NULL, return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_IN, NULL, skb,
skb->dev, NULL,
ip6_input_finish); ip6_input_finish);
} }

33
net/ipv6/ip6_output.c
View File

@ -56,7 +56,7 @@
#include <net/checksum.h> #include <net/checksum.h>
#include <linux/mroute6.h> #include <linux/mroute6.h>
static int ip6_finish_output2(struct sk_buff *skb) static int ip6_finish_output2(struct sock *sk, struct sk_buff *skb)
{ {
struct dst_entry *dst = skb_dst(skb); struct dst_entry *dst = skb_dst(skb);
struct net_device *dev = dst->dev; struct net_device *dev = dst->dev;
@ -70,7 +70,7 @@ static int ip6_finish_output2(struct sk_buff *skb)
if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) { if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) {
struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb)); struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));
if (!(dev->flags & IFF_LOOPBACK) && sk_mc_loop(skb->sk) && if (!(dev->flags & IFF_LOOPBACK) && sk_mc_loop(sk) &&
((mroute6_socket(dev_net(dev), skb) && ((mroute6_socket(dev_net(dev), skb) &&
!(IP6CB(skb)->flags & IP6SKB_FORWARDED)) || !(IP6CB(skb)->flags & IP6SKB_FORWARDED)) ||
ipv6_chk_mcast_addr(dev, &ipv6_hdr(skb)->daddr, ipv6_chk_mcast_addr(dev, &ipv6_hdr(skb)->daddr,
@ -82,7 +82,7 @@ static int ip6_finish_output2(struct sk_buff *skb)
*/ */
if (newskb) if (newskb)
NF_HOOK(NFPROTO_IPV6, NF_INET_POST_ROUTING, NF_HOOK(NFPROTO_IPV6, NF_INET_POST_ROUTING,
newskb, NULL, newskb->dev, sk, newskb, NULL, newskb->dev,
dev_loopback_xmit); dev_loopback_xmit);
if (ipv6_hdr(skb)->hop_limit == 0) { if (ipv6_hdr(skb)->hop_limit == 0) {
@ -122,14 +122,14 @@ static int ip6_finish_output2(struct sk_buff *skb)
return -EINVAL; return -EINVAL;
} }
static int ip6_finish_output(struct sk_buff *skb) static int ip6_finish_output(struct sock *sk, struct sk_buff *skb)
{ {
if ((skb->len > ip6_skb_dst_mtu(skb) && !skb_is_gso(skb)) || if ((skb->len > ip6_skb_dst_mtu(skb) && !skb_is_gso(skb)) ||
dst_allfrag(skb_dst(skb)) || dst_allfrag(skb_dst(skb)) ||
(IP6CB(skb)->frag_max_size && skb->len > IP6CB(skb)->frag_max_size)) (IP6CB(skb)->frag_max_size && skb->len > IP6CB(skb)->frag_max_size))
return ip6_fragment(skb, ip6_finish_output2); return ip6_fragment(sk, skb, ip6_finish_output2);
else else
return ip6_finish_output2(skb); return ip6_finish_output2(sk, skb);
} }
int ip6_output(struct sock *sk, struct sk_buff *skb) int ip6_output(struct sock *sk, struct sk_buff *skb)
@ -143,7 +143,8 @@ int ip6_output(struct sock *sk, struct sk_buff *skb)
return 0; return 0;
} }
return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, skb, NULL, dev, return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, sk, skb,
NULL, dev,
ip6_finish_output, ip6_finish_output,
!(IP6CB(skb)->flags & IP6SKB_REROUTED)); !(IP6CB(skb)->flags & IP6SKB_REROUTED));
} }
@ -223,8 +224,8 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
if ((skb->len <= mtu) || skb->ignore_df || skb_is_gso(skb)) { if ((skb->len <= mtu) || skb->ignore_df || skb_is_gso(skb)) {
IP6_UPD_PO_STATS(net, ip6_dst_idev(skb_dst(skb)), IP6_UPD_PO_STATS(net, ip6_dst_idev(skb_dst(skb)),
IPSTATS_MIB_OUT, skb->len); IPSTATS_MIB_OUT, skb->len);
return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL, return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, sk, skb,
dst->dev, dst_output); NULL, dst->dev, dst_output_sk);
} }
skb->dev = dst->dev; skb->dev = dst->dev;
@ -316,10 +317,10 @@ static int ip6_forward_proxy_check(struct sk_buff *skb)
return 0; return 0;
} }
static inline int ip6_forward_finish(struct sk_buff *skb) static inline int ip6_forward_finish(struct sock *sk, struct sk_buff *skb)
{ {
skb_sender_cpu_clear(skb); skb_sender_cpu_clear(skb);
return dst_output(skb); return dst_output_sk(sk, skb);
} }
static unsigned int ip6_dst_mtu_forward(const struct dst_entry *dst) static unsigned int ip6_dst_mtu_forward(const struct dst_entry *dst)
@ -511,7 +512,8 @@ int ip6_forward(struct sk_buff *skb)
IP6_INC_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS); IP6_INC_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS);
IP6_ADD_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTOCTETS, skb->len); IP6_ADD_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTOCTETS, skb->len);
return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD, skb, skb->dev, dst->dev, return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD, NULL, skb,
skb->dev, dst->dev,
ip6_forward_finish); ip6_forward_finish);
error: error:
@ -538,7 +540,8 @@ static void ip6_copy_metadata(struct sk_buff *to, struct sk_buff *from)
skb_copy_secmark(to, from); skb_copy_secmark(to, from);
} }
int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) int ip6_fragment(struct sock *sk, struct sk_buff *skb,
int (*output)(struct sock *, struct sk_buff *))
{ {
struct sk_buff *frag; struct sk_buff *frag;
struct rt6_info *rt = (struct rt6_info *)skb_dst(skb); struct rt6_info *rt = (struct rt6_info *)skb_dst(skb);
@ -667,7 +670,7 @@ int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
ip6_copy_metadata(frag, skb); ip6_copy_metadata(frag, skb);
} }
err = output(skb); err = output(sk, skb);
if (!err) if (!err)
IP6_INC_STATS(net, ip6_dst_idev(&rt->dst), IP6_INC_STATS(net, ip6_dst_idev(&rt->dst),
IPSTATS_MIB_FRAGCREATES); IPSTATS_MIB_FRAGCREATES);
@ -800,7 +803,7 @@ slow_path:
/* /*
* Put this fragment into the sending queue. * Put this fragment into the sending queue.
*/ */
err = output(frag); err = output(sk, frag);
if (err) if (err)
goto fail; goto fail;

2
net/ipv6/ip6_tunnel.c
View File

@ -1100,7 +1100,7 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
ipv6h->nexthdr = proto; ipv6h->nexthdr = proto;
ipv6h->saddr = fl6->saddr; ipv6h->saddr = fl6->saddr;
ipv6h->daddr = fl6->daddr; ipv6h->daddr = fl6->daddr;
ip6tunnel_xmit(skb, dev); ip6tunnel_xmit(NULL, skb, dev);
if (ndst) if (ndst)
ip6_tnl_dst_store(t, ndst); ip6_tnl_dst_store(t, ndst);
return 0; return 0;

5
net/ipv6/ip6_udp_tunnel.c
View File

@ -62,7 +62,8 @@ error:
} }
EXPORT_SYMBOL_GPL(udp_sock_create6); EXPORT_SYMBOL_GPL(udp_sock_create6);
int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb, int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,
struct sk_buff *skb,
struct net_device *dev, struct in6_addr *saddr, struct net_device *dev, struct in6_addr *saddr,
struct in6_addr *daddr, struct in6_addr *daddr,
__u8 prio, __u8 ttl, __be16 src_port, __u8 prio, __u8 ttl, __be16 src_port,
@ -97,7 +98,7 @@ int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb,
ip6h->daddr = *daddr; ip6h->daddr = *daddr;
ip6h->saddr = *saddr; ip6h->saddr = *saddr;
ip6tunnel_xmit(skb, dev); ip6tunnel_xmit(sk, skb, dev);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(udp_tunnel6_xmit_skb); EXPORT_SYMBOL_GPL(udp_tunnel6_xmit_skb);

7
net/ipv6/ip6mr.c
View File

@ -1986,13 +1986,13 @@ int ip6mr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)
} }
#endif #endif
static inline int ip6mr_forward2_finish(struct sk_buff *skb) static inline int ip6mr_forward2_finish(struct sock *sk, struct sk_buff *skb)
{ {
IP6_INC_STATS_BH(dev_net(skb_dst(skb)->dev), ip6_dst_idev(skb_dst(skb)), IP6_INC_STATS_BH(dev_net(skb_dst(skb)->dev), ip6_dst_idev(skb_dst(skb)),
IPSTATS_MIB_OUTFORWDATAGRAMS); IPSTATS_MIB_OUTFORWDATAGRAMS);
IP6_ADD_STATS_BH(dev_net(skb_dst(skb)->dev), ip6_dst_idev(skb_dst(skb)), IP6_ADD_STATS_BH(dev_net(skb_dst(skb)->dev), ip6_dst_idev(skb_dst(skb)),
IPSTATS_MIB_OUTOCTETS, skb->len); IPSTATS_MIB_OUTOCTETS, skb->len);
return dst_output(skb); return dst_output_sk(sk, skb);
} }
/* /*
@ -2064,7 +2064,8 @@ static int ip6mr_forward2(struct net *net, struct mr6_table *mrt,
IP6CB(skb)->flags |= IP6SKB_FORWARDED; IP6CB(skb)->flags |= IP6SKB_FORWARDED;
return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD, skb, skb->dev, dev, return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD, NULL, skb,
skb->dev, dev,
ip6mr_forward2_finish); ip6mr_forward2_finish);
out_free: out_free:

9
net/ipv6/mcast.c
View File

@ -1644,8 +1644,9 @@ static void mld_sendpack(struct sk_buff *skb)
payload_len = skb->len; payload_len = skb->len;
err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL, skb->dev, err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT,
dst_output); net->ipv6.igmp_sk, skb, NULL, skb->dev,
dst_output_sk);
out: out:
if (!err) { if (!err) {
ICMP6MSGOUT_INC_STATS(net, idev, ICMPV6_MLD2_REPORT); ICMP6MSGOUT_INC_STATS(net, idev, ICMPV6_MLD2_REPORT);
@ -2007,8 +2008,8 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
} }
skb_dst_set(skb, dst); skb_dst_set(skb, dst);
err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL, skb->dev, err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, sk, skb,
dst_output); NULL, skb->dev, dst_output_sk);
out: out:
if (!err) { if (!err) {
ICMP6MSGOUT_INC_STATS(net, idev, type); ICMP6MSGOUT_INC_STATS(net, idev, type);

5
net/ipv6/ndisc.c
View File

@ -463,8 +463,9 @@ static void ndisc_send_skb(struct sk_buff *skb,
idev = __in6_dev_get(dst->dev); idev = __in6_dev_get(dst->dev);
IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len); IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len);
err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev, err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, sk, skb,
dst_output); NULL, dst->dev,
dst_output_sk);
if (!err) { if (!err) {
ICMP6MSGOUT_INC_STATS(net, idev, type); ICMP6MSGOUT_INC_STATS(net, idev, type);
ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS); ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);

2
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
View File

@ -75,7 +75,7 @@ static unsigned int ipv6_defrag(const struct nf_hook_ops *ops,
nf_ct_frag6_consume_orig(reasm); nf_ct_frag6_consume_orig(reasm);
NF_HOOK_THRESH(NFPROTO_IPV6, ops->hooknum, reasm, NF_HOOK_THRESH(NFPROTO_IPV6, ops->hooknum, state->sk, reasm,
state->in, state->out, state->in, state->out,
state->okfn, NF_IP6_PRI_CONNTRACK_DEFRAG + 1); state->okfn, NF_IP6_PRI_CONNTRACK_DEFRAG + 1);

23
net/ipv6/output_core.c
View File

@ -136,7 +136,7 @@ int ip6_dst_hoplimit(struct dst_entry *dst)
EXPORT_SYMBOL(ip6_dst_hoplimit); EXPORT_SYMBOL(ip6_dst_hoplimit);
#endif #endif
int __ip6_local_out(struct sk_buff *skb) static int __ip6_local_out_sk(struct sock *sk, struct sk_buff *skb)
{ {
int len; int len;
@ -146,19 +146,30 @@ int __ip6_local_out(struct sk_buff *skb)
ipv6_hdr(skb)->payload_len = htons(len); ipv6_hdr(skb)->payload_len = htons(len);
IP6CB(skb)->nhoff = offsetof(struct ipv6hdr, nexthdr); IP6CB(skb)->nhoff = offsetof(struct ipv6hdr, nexthdr);
return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL, return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT, sk, skb,
skb_dst(skb)->dev, dst_output); NULL, skb_dst(skb)->dev, dst_output_sk);
}
int __ip6_local_out(struct sk_buff *skb)
{
return __ip6_local_out_sk(skb->sk, skb);
} }
EXPORT_SYMBOL_GPL(__ip6_local_out); EXPORT_SYMBOL_GPL(__ip6_local_out);
int ip6_local_out(struct sk_buff *skb) int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb)
{ {
int err; int err;
err = __ip6_local_out(skb); err = __ip6_local_out_sk(sk, skb);
if (likely(err == 1)) if (likely(err == 1))
err = dst_output(skb); err = dst_output_sk(sk, skb);
return err; return err;
} }
EXPORT_SYMBOL_GPL(ip6_local_out_sk);
int ip6_local_out(struct sk_buff *skb)
{
return ip6_local_out_sk(skb->sk, skb);
}
EXPORT_SYMBOL_GPL(ip6_local_out); EXPORT_SYMBOL_GPL(ip6_local_out);

4
net/ipv6/raw.c
View File

@ -652,8 +652,8 @@ static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
goto error_fault; goto error_fault;
IP6_UPD_PO_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUT, skb->len); IP6_UPD_PO_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUT, skb->len);
err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL, err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, sk, skb,
rt->dst.dev, dst_output); NULL, rt->dst.dev, dst_output_sk);
if (err > 0) if (err > 0)
err = net_xmit_errno(err); err = net_xmit_errno(err);
if (err) if (err)

3
net/ipv6/xfrm6_input.c
View File

@ -42,7 +42,8 @@ int xfrm6_transport_finish(struct sk_buff *skb, int async)
ipv6_hdr(skb)->payload_len = htons(skb->len); ipv6_hdr(skb)->payload_len = htons(skb->len);
__skb_push(skb, skb->data - skb_network_header(skb)); __skb_push(skb, skb->data - skb_network_header(skb));
NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING, skb, skb->dev, NULL, NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING, NULL, skb,
skb->dev, NULL,
ip6_rcv_finish); ip6_rcv_finish);
return -1; return -1;
} }

15
net/ipv6/xfrm6_output.c
View File

@ -120,7 +120,7 @@ int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb)
} }
EXPORT_SYMBOL(xfrm6_prepare_output); EXPORT_SYMBOL(xfrm6_prepare_output);
int xfrm6_output_finish(struct sk_buff *skb) int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb)
{ {
memset(IP6CB(skb), 0, sizeof(*IP6CB(skb))); memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
@ -128,10 +128,10 @@ int xfrm6_output_finish(struct sk_buff *skb)
IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED; IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
#endif #endif
return xfrm_output(skb); return xfrm_output(sk, skb);
} }
static int __xfrm6_output(struct sk_buff *skb) static int __xfrm6_output(struct sock *sk, struct sk_buff *skb)
{ {
struct dst_entry *dst = skb_dst(skb); struct dst_entry *dst = skb_dst(skb);
struct xfrm_state *x = dst->xfrm; struct xfrm_state *x = dst->xfrm;
@ -140,7 +140,7 @@ static int __xfrm6_output(struct sk_buff *skb)
#ifdef CONFIG_NETFILTER #ifdef CONFIG_NETFILTER
if (!x) { if (!x) {
IP6CB(skb)->flags |= IP6SKB_REROUTED; IP6CB(skb)->flags |= IP6SKB_REROUTED;
return dst_output(skb); return dst_output_sk(sk, skb);
} }
#endif #endif
@ -160,14 +160,15 @@ static int __xfrm6_output(struct sk_buff *skb)
if (x->props.mode == XFRM_MODE_TUNNEL && if (x->props.mode == XFRM_MODE_TUNNEL &&
((skb->len > mtu && !skb_is_gso(skb)) || ((skb->len > mtu && !skb_is_gso(skb)) ||
dst_allfrag(skb_dst(skb)))) { dst_allfrag(skb_dst(skb)))) {
return ip6_fragment(skb, x->outer_mode->afinfo->output_finish); return ip6_fragment(sk, skb,
x->outer_mode->afinfo->output_finish);
} }
return x->outer_mode->afinfo->output_finish(skb); return x->outer_mode->afinfo->output_finish(sk, skb);
} }
int xfrm6_output(struct sock *sk, struct sk_buff *skb) int xfrm6_output(struct sock *sk, struct sk_buff *skb)
{ {
return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, skb, return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, sk, skb,
NULL, skb_dst(skb)->dev, __xfrm6_output, NULL, skb_dst(skb)->dev, __xfrm6_output,
!(IP6CB(skb)->flags & IP6SKB_REROUTED)); !(IP6CB(skb)->flags & IP6SKB_REROUTED));
} }

8
net/netfilter/ipvs/ip_vs_xmit.c
View File

@ -536,8 +536,8 @@ static inline int ip_vs_nat_send_or_cont(int pf, struct sk_buff *skb,
ip_vs_update_conntrack(skb, cp, 1); ip_vs_update_conntrack(skb, cp, 1);
if (!local) { if (!local) {
skb_forward_csum(skb); skb_forward_csum(skb);
NF_HOOK(pf, NF_INET_LOCAL_OUT, skb, NULL, skb_dst(skb)->dev, NF_HOOK(pf, NF_INET_LOCAL_OUT, NULL, skb,
dst_output); NULL, skb_dst(skb)->dev, dst_output_sk);
} else } else
ret = NF_ACCEPT; ret = NF_ACCEPT;
return ret; return ret;
@ -554,8 +554,8 @@ static inline int ip_vs_send_or_cont(int pf, struct sk_buff *skb,
ip_vs_notrack(skb); ip_vs_notrack(skb);
if (!local) { if (!local) {
skb_forward_csum(skb); skb_forward_csum(skb);
NF_HOOK(pf, NF_INET_LOCAL_OUT, skb, NULL, skb_dst(skb)->dev, NF_HOOK(pf, NF_INET_LOCAL_OUT, NULL, skb,
dst_output); NULL, skb_dst(skb)->dev, dst_output_sk);
} else } else
ret = NF_ACCEPT; ret = NF_ACCEPT;
return ret; return ret;

6
net/netfilter/nf_queue.c
View File

@ -54,6 +54,8 @@ void nf_queue_entry_release_refs(struct nf_queue_entry *entry)
dev_put(state->in); dev_put(state->in);
if (state->out) if (state->out)
dev_put(state->out); dev_put(state->out);
if (state->sk)
sock_put(state->sk);
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
if (entry->skb->nf_bridge) { if (entry->skb->nf_bridge) {
struct nf_bridge_info *nf_bridge = entry->skb->nf_bridge; struct nf_bridge_info *nf_bridge = entry->skb->nf_bridge;
@ -81,6 +83,8 @@ bool nf_queue_entry_get_refs(struct nf_queue_entry *entry)
dev_hold(state->in); dev_hold(state->in);
if (state->out) if (state->out)
dev_hold(state->out); dev_hold(state->out);
if (state->sk)
sock_hold(state->sk);
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
if (entry->skb->nf_bridge) { if (entry->skb->nf_bridge) {
struct nf_bridge_info *nf_bridge = entry->skb->nf_bridge; struct nf_bridge_info *nf_bridge = entry->skb->nf_bridge;
@ -198,7 +202,7 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
case NF_ACCEPT: case NF_ACCEPT:
case NF_STOP: case NF_STOP:
local_bh_disable(); local_bh_disable();
entry->state.okfn(skb); entry->state.okfn(entry->state.sk, skb);
local_bh_enable(); local_bh_enable();
break; break;
case NF_QUEUE: case NF_QUEUE:

5
net/openvswitch/vport-vxlan.c
View File

@ -222,7 +222,8 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb)
{ {
struct net *net = ovs_dp_get_net(vport->dp); struct net *net = ovs_dp_get_net(vport->dp);
struct vxlan_port *vxlan_port = vxlan_vport(vport); struct vxlan_port *vxlan_port = vxlan_vport(vport);
__be16 dst_port = inet_sk(vxlan_port->vs->sock->sk)->inet_sport; struct sock *sk = vxlan_port->vs->sock->sk;
__be16 dst_port = inet_sk(sk)->inet_sport;
const struct ovs_key_ipv4_tunnel *tun_key; const struct ovs_key_ipv4_tunnel *tun_key;
struct vxlan_metadata md = {0}; struct vxlan_metadata md = {0};
struct rtable *rt; struct rtable *rt;
@ -255,7 +256,7 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb)
vxflags = vxlan_port->exts | vxflags = vxlan_port->exts |
(tun_key->tun_flags & TUNNEL_CSUM ? VXLAN_F_UDP_CSUM : 0); (tun_key->tun_flags & TUNNEL_CSUM ? VXLAN_F_UDP_CSUM : 0);
err = vxlan_xmit_skb(rt, skb, fl.saddr, tun_key->ipv4_dst, err = vxlan_xmit_skb(rt, sk, skb, fl.saddr, tun_key->ipv4_dst,
tun_key->ipv4_tos, tun_key->ipv4_ttl, df, tun_key->ipv4_tos, tun_key->ipv4_ttl, df,
src_port, dst_port, src_port, dst_port,
&md, false, vxflags); &md, false, vxflags);

6
net/tipc/udp_media.c
View File

@ -176,7 +176,8 @@ static int tipc_udp_send_msg(struct net *net, struct sk_buff *skb,
goto tx_error; goto tx_error;
} }
ttl = ip4_dst_hoplimit(&rt->dst); ttl = ip4_dst_hoplimit(&rt->dst);
err = udp_tunnel_xmit_skb(rt, clone, src->ipv4.s_addr, err = udp_tunnel_xmit_skb(rt, ub->ubsock->sk, clone,
src->ipv4.s_addr,
dst->ipv4.s_addr, 0, ttl, 0, dst->ipv4.s_addr, 0, ttl, 0,
src->udp_port, dst->udp_port, src->udp_port, dst->udp_port,
false, true); false, true);
@ -197,7 +198,8 @@ static int tipc_udp_send_msg(struct net *net, struct sk_buff *skb,
if (err) if (err)
goto tx_error; goto tx_error;
ttl = ip6_dst_hoplimit(ndst); ttl = ip6_dst_hoplimit(ndst);
err = udp_tunnel6_xmit_skb(ndst, clone, ndst->dev, &src->ipv6, err = udp_tunnel6_xmit_skb(ndst, ub->ubsock->sk, clone,
ndst->dev, &src->ipv6,
&dst->ipv6, 0, ttl, src->udp_port, &dst->ipv6, 0, ttl, src->udp_port,
dst->udp_port, false); dst->udp_port, false);
#endif #endif

16
net/xfrm/xfrm_output.c
View File

@ -19,7 +19,7 @@
#include <net/dst.h> #include <net/dst.h>
#include <net/xfrm.h> #include <net/xfrm.h>
static int xfrm_output2(struct sk_buff *skb); static int xfrm_output2(struct sock *sk, struct sk_buff *skb);
static int xfrm_skb_check_space(struct sk_buff *skb) static int xfrm_skb_check_space(struct sk_buff *skb)
{ {
@ -130,7 +130,7 @@ int xfrm_output_resume(struct sk_buff *skb, int err)
return dst_output(skb); return dst_output(skb);
err = nf_hook(skb_dst(skb)->ops->family, err = nf_hook(skb_dst(skb)->ops->family,
NF_INET_POST_ROUTING, skb, NF_INET_POST_ROUTING, skb->sk, skb,
NULL, skb_dst(skb)->dev, xfrm_output2); NULL, skb_dst(skb)->dev, xfrm_output2);
if (unlikely(err != 1)) if (unlikely(err != 1))
goto out; goto out;
@ -144,12 +144,12 @@ out:
} }
EXPORT_SYMBOL_GPL(xfrm_output_resume); EXPORT_SYMBOL_GPL(xfrm_output_resume);
static int xfrm_output2(struct sk_buff *skb) static int xfrm_output2(struct sock *sk, struct sk_buff *skb)
{ {
return xfrm_output_resume(skb, 1); return xfrm_output_resume(skb, 1);
} }
static int xfrm_output_gso(struct sk_buff *skb) static int xfrm_output_gso(struct sock *sk, struct sk_buff *skb)
{ {
struct sk_buff *segs; struct sk_buff *segs;
@ -165,7 +165,7 @@ static int xfrm_output_gso(struct sk_buff *skb)
int err; int err;
segs->next = NULL; segs->next = NULL;
err = xfrm_output2(segs); err = xfrm_output2(sk, segs);
if (unlikely(err)) { if (unlikely(err)) {
kfree_skb_list(nskb); kfree_skb_list(nskb);
@ -178,13 +178,13 @@ static int xfrm_output_gso(struct sk_buff *skb)
return 0; return 0;
} }
int xfrm_output(struct sk_buff *skb) int xfrm_output(struct sock *sk, struct sk_buff *skb)
{ {
struct net *net = dev_net(skb_dst(skb)->dev); struct net *net = dev_net(skb_dst(skb)->dev);
int err; int err;
if (skb_is_gso(skb)) if (skb_is_gso(skb))
return xfrm_output_gso(skb); return xfrm_output_gso(sk, skb);
if (skb->ip_summed == CHECKSUM_PARTIAL) { if (skb->ip_summed == CHECKSUM_PARTIAL) {
err = skb_checksum_help(skb); err = skb_checksum_help(skb);
@ -195,7 +195,7 @@ int xfrm_output(struct sk_buff *skb)
} }
} }
return xfrm_output2(skb); return xfrm_output2(sk, skb);
} }
EXPORT_SYMBOL_GPL(xfrm_output); EXPORT_SYMBOL_GPL(xfrm_output);