[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 4/7] net/eth: Check size earlier in _eth_get_rss_ex_dst_addr()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v6 4/7] net/eth: Check size earlier in _eth_get_rss_ex_dst_addr() |
Date: |
Wed, 10 Mar 2021 19:31:20 +0100 |
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
net/eth.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/net/eth.c b/net/eth.c
index ed047b5760b..492359afbbb 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -406,16 +406,14 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int
pkt_frags,
struct in6_address *dst_addr)
{
struct ip6_ext_hdr_routing *rthdr = (struct ip6_ext_hdr_routing *) ext_hdr;
+ size_t input_size = iov_size(pkt, pkt_frags);
+ size_t bytes_read;
+
+ if (input_size < ext_hdr_offset + sizeof(*ext_hdr)) {
+ return false;
+ }
if ((rthdr->rtype == 2) && (rthdr->segleft == 1)) {
-
- size_t input_size = iov_size(pkt, pkt_frags);
- size_t bytes_read;
-
- if (input_size < ext_hdr_offset + sizeof(*ext_hdr)) {
- return false;
- }
-
bytes_read = iov_to_buf(pkt, pkt_frags,
ext_hdr_offset + sizeof(*rthdr),
dst_addr, sizeof(*dst_addr));
--
2.26.2
- [PATCH v6 0/7] net/eth: Fix stack-buffer-overflow in _eth_get_rss_ex_dst_addr(), Philippe Mathieu-Daudé, 2021/03/10
- [PATCH v6 1/7] net/eth: Use correct in6_address offset in _eth_get_rss_ex_dst_addr(), Philippe Mathieu-Daudé, 2021/03/10
- [PATCH v6 2/7] net/eth: Simplify _eth_get_rss_ex_dst_addr(), Philippe Mathieu-Daudé, 2021/03/10
- [PATCH v6 3/7] net/eth: Better describe _eth_get_rss_ex_dst_addr's offset argument, Philippe Mathieu-Daudé, 2021/03/10
- [PATCH v6 4/7] net/eth: Check size earlier in _eth_get_rss_ex_dst_addr(),
Philippe Mathieu-Daudé <=
- [PATCH v6 5/7] net/eth: Check iovec has enough data earlier, Philippe Mathieu-Daudé, 2021/03/10
- [PATCH v6 7/7] net/eth: Add an assert() and invert if() statement to simplify code, Philippe Mathieu-Daudé, 2021/03/10
- [PATCH v6 6/7] net/eth: Read ip6_ext_hdr_routing buffer before accessing it, Philippe Mathieu-Daudé, 2021/03/10
Re: [PATCH v6 0/7] net/eth: Fix stack-buffer-overflow in _eth_get_rss_ex_dst_addr(), Miroslav Rezanina, 2021/03/11
Re: [PATCH v6 0/7] net/eth: Fix stack-buffer-overflow in _eth_get_rss_ex_dst_addr(), Jason Wang, 2021/03/22