diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-29 20:02:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-29 20:02:55 +0300 |
| commit | bfbe5bab66e1aa68033786599cc495e6728e55e8 (patch) | |
| tree | 68e92d489b96c65ef2fe4a662d615d9400af3635 /include/linux/skb_array.h | |
| parent | 7ece54a60ee2ba7a386308cae73c790bd580589c (diff) | |
| parent | 491847f3b29cef0417a03142b96e2a6dea81cca0 (diff) | |
| download | linux-bfbe5bab66e1aa68033786599cc495e6728e55e8.tar.xz | |
Merge branch 'ptr_ring-fixes'
Michael S. Tsirkin says:
====================
ptr_ring fixes
This fixes a bunch of issues around ptr_ring use in net core.
One of these: "tap: fix use-after-free" is also needed on net,
but can't be backported cleanly.
I will post a net patch separately.
Lightly tested - Jason, could you pls confirm this
addresses the security issue you saw with ptr_ring?
Testing reports would be appreciated too.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Tested-by: Jason Wang <jasowang@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'include/linux/skb_array.h')
| -rw-r--r-- | include/linux/skb_array.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/skb_array.h b/include/linux/skb_array.h index c7addf37d119..a6b6e8bb3d7b 100644 --- a/include/linux/skb_array.h +++ b/include/linux/skb_array.h @@ -69,7 +69,7 @@ static inline int skb_array_produce_any(struct skb_array *a, struct sk_buff *skb */ static inline bool __skb_array_empty(struct skb_array *a) { - return !__ptr_ring_peek(&a->ring); + return __ptr_ring_empty(&a->ring); } static inline struct sk_buff *__skb_array_peek(struct skb_array *a) |