diff options
| author | Jakub Kicinski <[email protected]> | 2023-02-13 19:55:34 -0800 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2023-02-13 19:55:35 -0800 |
| commit | 64816aa7683091cb5dbacaf9b355761961c8a657 (patch) | |
| tree | a8a76e9fc7abe40f9dc98c8752945285e3a7e18a /include/linux | |
| parent | 1a940b00013a468c0c9dd79dbb485c3ad273939e (diff) | |
| parent | 545dbcd124b02c9dc93c8a5894c71d682effc3e6 (diff) | |
Merge branch 'ipv6-more-drop-reason'
Eric Dumazet says:
====================
ipv6: more drop reason
Add more drop reasons to IPv6:
- IPV6_BAD_EXTHDR
- IPV6_NDISC_FRAG
- IPV6_NDISC_HOP_LIMIT
- IPV6_NDISC_BAD_CODE
====================
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/skbuff.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 47ab28a37f2f..d5602b15c714 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2631,13 +2631,24 @@ void *skb_pull_data(struct sk_buff *skb, size_t len); void *__pskb_pull_tail(struct sk_buff *skb, int delta); -static inline bool pskb_may_pull(struct sk_buff *skb, unsigned int len) +static inline enum skb_drop_reason +pskb_may_pull_reason(struct sk_buff *skb, unsigned int len) { if (likely(len <= skb_headlen(skb))) - return true; + return SKB_NOT_DROPPED_YET; + if (unlikely(len > skb->len)) - return false; - return __pskb_pull_tail(skb, len - skb_headlen(skb)) != NULL; + return SKB_DROP_REASON_PKT_TOO_SMALL; + + if (unlikely(!__pskb_pull_tail(skb, len - skb_headlen(skb)))) + return SKB_DROP_REASON_NOMEM; + + return SKB_NOT_DROPPED_YET; +} + +static inline bool pskb_may_pull(struct sk_buff *skb, unsigned int len) +{ + return pskb_may_pull_reason(skb, len) == SKB_NOT_DROPPED_YET; } static inline void *pskb_pull(struct sk_buff *skb, unsigned int len) |