mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 11:51:27 +00:00
net: add support for skbs with unreadable frags
For device memory TCP, we expect the skb headers to be available in host memory for access, and we expect the skb frags to be in device memory and unaccessible to the host. We expect there to be no mixing and matching of device memory frags (unaccessible) with host memory frags (accessible) in the same skb. Add a skb->devmem flag which indicates whether the frags in this skb are device memory frags or not. __skb_fill_netmem_desc() now checks frags added to skbs for net_iov, and marks the skb as skb->devmem accordingly. Add checks through the network stack to avoid accessing the frags of devmem skbs and avoid coalescing devmem skbs with non devmem skbs. Signed-off-by: Willem de Bruijn <willemb@google.com> Signed-off-by: Kaiyuan Zhang <kaiyuanz@google.com> Signed-off-by: Mina Almasry <almasrymina@google.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Jakub Kicinski <kuba@kernel.org> Link: https://patch.msgid.link/20240910171458.219195-9-almasrymina@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
9f6b619edf
commit
65249feb6b
@ -827,6 +827,8 @@ enum skb_tstamp_type {
|
|||||||
* @csum_level: indicates the number of consecutive checksums found in
|
* @csum_level: indicates the number of consecutive checksums found in
|
||||||
* the packet minus one that have been verified as
|
* the packet minus one that have been verified as
|
||||||
* CHECKSUM_UNNECESSARY (max 3)
|
* CHECKSUM_UNNECESSARY (max 3)
|
||||||
|
* @unreadable: indicates that at least 1 of the fragments in this skb is
|
||||||
|
* unreadable.
|
||||||
* @dst_pending_confirm: need to confirm neighbour
|
* @dst_pending_confirm: need to confirm neighbour
|
||||||
* @decrypted: Decrypted SKB
|
* @decrypted: Decrypted SKB
|
||||||
* @slow_gro: state present at GRO time, slower prepare step required
|
* @slow_gro: state present at GRO time, slower prepare step required
|
||||||
@ -1008,7 +1010,7 @@ struct sk_buff {
|
|||||||
#if IS_ENABLED(CONFIG_IP_SCTP)
|
#if IS_ENABLED(CONFIG_IP_SCTP)
|
||||||
__u8 csum_not_inet:1;
|
__u8 csum_not_inet:1;
|
||||||
#endif
|
#endif
|
||||||
|
__u8 unreadable:1;
|
||||||
#if defined(CONFIG_NET_SCHED) || defined(CONFIG_NET_XGRESS)
|
#if defined(CONFIG_NET_SCHED) || defined(CONFIG_NET_XGRESS)
|
||||||
__u16 tc_index; /* traffic control index */
|
__u16 tc_index; /* traffic control index */
|
||||||
#endif
|
#endif
|
||||||
@ -1824,6 +1826,12 @@ static inline void skb_zcopy_downgrade_managed(struct sk_buff *skb)
|
|||||||
__skb_zcopy_downgrade_managed(skb);
|
__skb_zcopy_downgrade_managed(skb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Return true if frags in this skb are readable by the host. */
|
||||||
|
static inline bool skb_frags_readable(const struct sk_buff *skb)
|
||||||
|
{
|
||||||
|
return !skb->unreadable;
|
||||||
|
}
|
||||||
|
|
||||||
static inline void skb_mark_not_on_list(struct sk_buff *skb)
|
static inline void skb_mark_not_on_list(struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
skb->next = NULL;
|
skb->next = NULL;
|
||||||
@ -2540,10 +2548,17 @@ static inline void skb_len_add(struct sk_buff *skb, int delta)
|
|||||||
static inline void __skb_fill_netmem_desc(struct sk_buff *skb, int i,
|
static inline void __skb_fill_netmem_desc(struct sk_buff *skb, int i,
|
||||||
netmem_ref netmem, int off, int size)
|
netmem_ref netmem, int off, int size)
|
||||||
{
|
{
|
||||||
struct page *page = netmem_to_page(netmem);
|
struct page *page;
|
||||||
|
|
||||||
__skb_fill_netmem_desc_noacc(skb_shinfo(skb), i, netmem, off, size);
|
__skb_fill_netmem_desc_noacc(skb_shinfo(skb), i, netmem, off, size);
|
||||||
|
|
||||||
|
if (netmem_is_net_iov(netmem)) {
|
||||||
|
skb->unreadable = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
page = netmem_to_page(netmem);
|
||||||
|
|
||||||
/* Propagate page pfmemalloc to the skb if we can. The problem is
|
/* Propagate page pfmemalloc to the skb if we can. The problem is
|
||||||
* that not all callers have unique ownership of the page but rely
|
* that not all callers have unique ownership of the page but rely
|
||||||
* on page_is_pfmemalloc doing the right thing(tm).
|
* on page_is_pfmemalloc doing the right thing(tm).
|
||||||
|
@ -1069,7 +1069,8 @@ static inline bool tcp_skb_can_collapse(const struct sk_buff *to,
|
|||||||
/* skb_cmp_decrypted() not needed, use tcp_write_collapse_fence() */
|
/* skb_cmp_decrypted() not needed, use tcp_write_collapse_fence() */
|
||||||
return likely(tcp_skb_can_collapse_to(to) &&
|
return likely(tcp_skb_can_collapse_to(to) &&
|
||||||
mptcp_skb_can_collapse(to, from) &&
|
mptcp_skb_can_collapse(to, from) &&
|
||||||
skb_pure_zcopy_same(to, from));
|
skb_pure_zcopy_same(to, from) &&
|
||||||
|
skb_frags_readable(to) == skb_frags_readable(from));
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool tcp_skb_can_collapse_rx(const struct sk_buff *to,
|
static inline bool tcp_skb_can_collapse_rx(const struct sk_buff *to,
|
||||||
|
@ -407,6 +407,9 @@ static int __skb_datagram_iter(const struct sk_buff *skb, int offset,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
goto short_copy;
|
||||||
|
|
||||||
/* Copy paged appendix. Hmm... why does this look so complicated? */
|
/* Copy paged appendix. Hmm... why does this look so complicated? */
|
||||||
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
|
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
|
||||||
int end;
|
int end;
|
||||||
@ -623,6 +626,9 @@ int zerocopy_fill_skb_from_iter(struct sk_buff *skb,
|
|||||||
{
|
{
|
||||||
int frag = skb_shinfo(skb)->nr_frags;
|
int frag = skb_shinfo(skb)->nr_frags;
|
||||||
|
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
return -EFAULT;
|
||||||
|
|
||||||
while (length && iov_iter_count(from)) {
|
while (length && iov_iter_count(from)) {
|
||||||
struct page *head, *last_head = NULL;
|
struct page *head, *last_head = NULL;
|
||||||
struct page *pages[MAX_SKB_FRAGS];
|
struct page *pages[MAX_SKB_FRAGS];
|
||||||
|
@ -3312,6 +3312,10 @@ int skb_checksum_help(struct sk_buff *skb)
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!skb_frags_readable(skb)) {
|
||||||
|
return -EFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
/* Before computing a checksum, we should make sure no frag could
|
/* Before computing a checksum, we should make sure no frag could
|
||||||
* be modified by an external entity : checksum could be wrong.
|
* be modified by an external entity : checksum could be wrong.
|
||||||
*/
|
*/
|
||||||
|
@ -1972,6 +1972,9 @@ int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask)
|
|||||||
if (skb_shared(skb) || skb_unclone(skb, gfp_mask))
|
if (skb_shared(skb) || skb_unclone(skb, gfp_mask))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
return -EFAULT;
|
||||||
|
|
||||||
if (!num_frags)
|
if (!num_frags)
|
||||||
goto release;
|
goto release;
|
||||||
|
|
||||||
@ -2145,6 +2148,9 @@ struct sk_buff *skb_copy(const struct sk_buff *skb, gfp_t gfp_mask)
|
|||||||
unsigned int size;
|
unsigned int size;
|
||||||
int headerlen;
|
int headerlen;
|
||||||
|
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
if (WARN_ON_ONCE(skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST))
|
if (WARN_ON_ONCE(skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
@ -2483,6 +2489,9 @@ struct sk_buff *skb_copy_expand(const struct sk_buff *skb,
|
|||||||
struct sk_buff *n;
|
struct sk_buff *n;
|
||||||
int oldheadroom;
|
int oldheadroom;
|
||||||
|
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
if (WARN_ON_ONCE(skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST))
|
if (WARN_ON_ONCE(skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
@ -2827,6 +2836,9 @@ void *__pskb_pull_tail(struct sk_buff *skb, int delta)
|
|||||||
*/
|
*/
|
||||||
int i, k, eat = (skb->tail + delta) - skb->end;
|
int i, k, eat = (skb->tail + delta) - skb->end;
|
||||||
|
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
if (eat > 0 || skb_cloned(skb)) {
|
if (eat > 0 || skb_cloned(skb)) {
|
||||||
if (pskb_expand_head(skb, 0, eat > 0 ? eat + 128 : 0,
|
if (pskb_expand_head(skb, 0, eat > 0 ? eat + 128 : 0,
|
||||||
GFP_ATOMIC))
|
GFP_ATOMIC))
|
||||||
@ -2980,6 +2992,9 @@ int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len)
|
|||||||
to += copy;
|
to += copy;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
goto fault;
|
||||||
|
|
||||||
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
|
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
|
||||||
int end;
|
int end;
|
||||||
skb_frag_t *f = &skb_shinfo(skb)->frags[i];
|
skb_frag_t *f = &skb_shinfo(skb)->frags[i];
|
||||||
@ -3168,6 +3183,9 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe,
|
|||||||
/*
|
/*
|
||||||
* then map the fragments
|
* then map the fragments
|
||||||
*/
|
*/
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
return false;
|
||||||
|
|
||||||
for (seg = 0; seg < skb_shinfo(skb)->nr_frags; seg++) {
|
for (seg = 0; seg < skb_shinfo(skb)->nr_frags; seg++) {
|
||||||
const skb_frag_t *f = &skb_shinfo(skb)->frags[seg];
|
const skb_frag_t *f = &skb_shinfo(skb)->frags[seg];
|
||||||
|
|
||||||
@ -3391,6 +3409,9 @@ int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len)
|
|||||||
from += copy;
|
from += copy;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
goto fault;
|
||||||
|
|
||||||
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
|
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
|
||||||
skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
|
skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
|
||||||
int end;
|
int end;
|
||||||
@ -3470,6 +3491,9 @@ __wsum __skb_checksum(const struct sk_buff *skb, int offset, int len,
|
|||||||
pos = copy;
|
pos = copy;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (WARN_ON_ONCE(!skb_frags_readable(skb)))
|
||||||
|
return 0;
|
||||||
|
|
||||||
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
|
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
|
||||||
int end;
|
int end;
|
||||||
skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
|
skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
|
||||||
@ -3570,6 +3594,9 @@ __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset,
|
|||||||
pos = copy;
|
pos = copy;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
return 0;
|
||||||
|
|
||||||
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
|
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
|
||||||
int end;
|
int end;
|
||||||
|
|
||||||
@ -4061,6 +4088,7 @@ static inline void skb_split_inside_header(struct sk_buff *skb,
|
|||||||
skb_shinfo(skb1)->frags[i] = skb_shinfo(skb)->frags[i];
|
skb_shinfo(skb1)->frags[i] = skb_shinfo(skb)->frags[i];
|
||||||
|
|
||||||
skb_shinfo(skb1)->nr_frags = skb_shinfo(skb)->nr_frags;
|
skb_shinfo(skb1)->nr_frags = skb_shinfo(skb)->nr_frags;
|
||||||
|
skb1->unreadable = skb->unreadable;
|
||||||
skb_shinfo(skb)->nr_frags = 0;
|
skb_shinfo(skb)->nr_frags = 0;
|
||||||
skb1->data_len = skb->data_len;
|
skb1->data_len = skb->data_len;
|
||||||
skb1->len += skb1->data_len;
|
skb1->len += skb1->data_len;
|
||||||
@ -4108,6 +4136,8 @@ static inline void skb_split_no_header(struct sk_buff *skb,
|
|||||||
pos += size;
|
pos += size;
|
||||||
}
|
}
|
||||||
skb_shinfo(skb1)->nr_frags = k;
|
skb_shinfo(skb1)->nr_frags = k;
|
||||||
|
|
||||||
|
skb1->unreadable = skb->unreadable;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -4345,6 +4375,9 @@ next_skb:
|
|||||||
return block_limit - abs_offset;
|
return block_limit - abs_offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!skb_frags_readable(st->cur_skb))
|
||||||
|
return 0;
|
||||||
|
|
||||||
if (st->frag_idx == 0 && !st->frag_data)
|
if (st->frag_idx == 0 && !st->frag_data)
|
||||||
st->stepped_offset += skb_headlen(st->cur_skb);
|
st->stepped_offset += skb_headlen(st->cur_skb);
|
||||||
|
|
||||||
@ -5992,7 +6025,10 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
|
|||||||
if (to->pp_recycle != from->pp_recycle)
|
if (to->pp_recycle != from->pp_recycle)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (len <= skb_tailroom(to)) {
|
if (skb_frags_readable(from) != skb_frags_readable(to))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (len <= skb_tailroom(to) && skb_frags_readable(from)) {
|
||||||
if (len)
|
if (len)
|
||||||
BUG_ON(skb_copy_bits(from, 0, skb_put(to, len), len));
|
BUG_ON(skb_copy_bits(from, 0, skb_put(to, len), len));
|
||||||
*delta_truesize = 0;
|
*delta_truesize = 0;
|
||||||
@ -6169,6 +6205,9 @@ int skb_ensure_writable(struct sk_buff *skb, unsigned int write_len)
|
|||||||
if (!pskb_may_pull(skb, write_len))
|
if (!pskb_may_pull(skb, write_len))
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
return -EFAULT;
|
||||||
|
|
||||||
if (!skb_cloned(skb) || skb_clone_writable(skb, write_len))
|
if (!skb_cloned(skb) || skb_clone_writable(skb, write_len))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@ -6848,7 +6887,7 @@ void skb_condense(struct sk_buff *skb)
|
|||||||
{
|
{
|
||||||
if (skb->data_len) {
|
if (skb->data_len) {
|
||||||
if (skb->data_len > skb->end - skb->tail ||
|
if (skb->data_len > skb->end - skb->tail ||
|
||||||
skb_cloned(skb))
|
skb_cloned(skb) || !skb_frags_readable(skb))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* Nice, we can free page frag(s) right now */
|
/* Nice, we can free page frag(s) right now */
|
||||||
|
@ -2160,6 +2160,9 @@ static int tcp_zerocopy_receive(struct sock *sk,
|
|||||||
skb = tcp_recv_skb(sk, seq, &offset);
|
skb = tcp_recv_skb(sk, seq, &offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
break;
|
||||||
|
|
||||||
if (TCP_SKB_CB(skb)->has_rxtstamp) {
|
if (TCP_SKB_CB(skb)->has_rxtstamp) {
|
||||||
tcp_update_recv_tstamps(skb, tss);
|
tcp_update_recv_tstamps(skb, tss);
|
||||||
zc->msg_flags |= TCP_CMSG_TS;
|
zc->msg_flags |= TCP_CMSG_TS;
|
||||||
|
@ -5391,6 +5391,9 @@ restart:
|
|||||||
for (end_of_skbs = true; skb != NULL && skb != tail; skb = n) {
|
for (end_of_skbs = true; skb != NULL && skb != tail; skb = n) {
|
||||||
n = tcp_skb_next(skb, list);
|
n = tcp_skb_next(skb, list);
|
||||||
|
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
goto skip_this;
|
||||||
|
|
||||||
/* No new bits? It is possible on ofo queue. */
|
/* No new bits? It is possible on ofo queue. */
|
||||||
if (!before(start, TCP_SKB_CB(skb)->end_seq)) {
|
if (!before(start, TCP_SKB_CB(skb)->end_seq)) {
|
||||||
skb = tcp_collapse_one(sk, skb, list, root);
|
skb = tcp_collapse_one(sk, skb, list, root);
|
||||||
@ -5411,17 +5414,20 @@ restart:
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (n && n != tail && tcp_skb_can_collapse_rx(skb, n) &&
|
if (n && n != tail && skb_frags_readable(n) &&
|
||||||
|
tcp_skb_can_collapse_rx(skb, n) &&
|
||||||
TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(n)->seq) {
|
TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(n)->seq) {
|
||||||
end_of_skbs = false;
|
end_of_skbs = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
skip_this:
|
||||||
/* Decided to skip this, advance start seq. */
|
/* Decided to skip this, advance start seq. */
|
||||||
start = TCP_SKB_CB(skb)->end_seq;
|
start = TCP_SKB_CB(skb)->end_seq;
|
||||||
}
|
}
|
||||||
if (end_of_skbs ||
|
if (end_of_skbs ||
|
||||||
(TCP_SKB_CB(skb)->tcp_flags & (TCPHDR_SYN | TCPHDR_FIN)))
|
(TCP_SKB_CB(skb)->tcp_flags & (TCPHDR_SYN | TCPHDR_FIN)) ||
|
||||||
|
!skb_frags_readable(skb))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
__skb_queue_head_init(&tmp);
|
__skb_queue_head_init(&tmp);
|
||||||
@ -5463,7 +5469,8 @@ restart:
|
|||||||
if (!skb ||
|
if (!skb ||
|
||||||
skb == tail ||
|
skb == tail ||
|
||||||
!tcp_skb_can_collapse_rx(nskb, skb) ||
|
!tcp_skb_can_collapse_rx(nskb, skb) ||
|
||||||
(TCP_SKB_CB(skb)->tcp_flags & (TCPHDR_SYN | TCPHDR_FIN)))
|
(TCP_SKB_CB(skb)->tcp_flags & (TCPHDR_SYN | TCPHDR_FIN)) ||
|
||||||
|
!skb_frags_readable(skb))
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2344,7 +2344,8 @@ static bool tcp_can_coalesce_send_queue_head(struct sock *sk, int len)
|
|||||||
|
|
||||||
if (unlikely(TCP_SKB_CB(skb)->eor) ||
|
if (unlikely(TCP_SKB_CB(skb)->eor) ||
|
||||||
tcp_has_tx_tstamp(skb) ||
|
tcp_has_tx_tstamp(skb) ||
|
||||||
!skb_pure_zcopy_same(skb, next))
|
!skb_pure_zcopy_same(skb, next) ||
|
||||||
|
skb_frags_readable(skb) != skb_frags_readable(next))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
len -= skb->len;
|
len -= skb->len;
|
||||||
@ -3264,6 +3265,8 @@ static bool tcp_can_collapse(const struct sock *sk, const struct sk_buff *skb)
|
|||||||
return false;
|
return false;
|
||||||
if (skb_cloned(skb))
|
if (skb_cloned(skb))
|
||||||
return false;
|
return false;
|
||||||
|
if (!skb_frags_readable(skb))
|
||||||
|
return false;
|
||||||
/* Some heuristics for collapsing over SACK'd could be invented */
|
/* Some heuristics for collapsing over SACK'd could be invented */
|
||||||
if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)
|
if (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)
|
||||||
return false;
|
return false;
|
||||||
|
@ -2216,7 +2216,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
snaplen = skb->len;
|
snaplen = skb_frags_readable(skb) ? skb->len : skb_headlen(skb);
|
||||||
|
|
||||||
res = run_filter(skb, sk, snaplen);
|
res = run_filter(skb, sk, snaplen);
|
||||||
if (!res)
|
if (!res)
|
||||||
@ -2336,7 +2336,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
snaplen = skb->len;
|
snaplen = skb_frags_readable(skb) ? skb->len : skb_headlen(skb);
|
||||||
|
|
||||||
res = run_filter(skb, sk, snaplen);
|
res = run_filter(skb, sk, snaplen);
|
||||||
if (!res)
|
if (!res)
|
||||||
|
Loading…
Reference in New Issue
Block a user