From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Dmitry Fleytman" <dmitry.fleytman@gmail.com>,
"Jason Wang" <jasowang@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Miroslav Rezanina" <mrezanin@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Stefano Garzarella" <sgarzare@redhat.com>
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 [thread overview]
Message-ID: <20210310183123.1212612-5-philmd@redhat.com> (raw)
In-Reply-To: <20210310183123.1212612-1-philmd@redhat.com>
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
next prev parent reply other threads:[~2021-03-10 18:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 18:31 [PATCH v6 0/7] net/eth: Fix stack-buffer-overflow in _eth_get_rss_ex_dst_addr() Philippe Mathieu-Daudé
2021-03-10 18:31 ` [PATCH v6 1/7] net/eth: Use correct in6_address offset " Philippe Mathieu-Daudé
2021-03-11 8:10 ` Stefano Garzarella
2021-03-10 18:31 ` [PATCH v6 2/7] net/eth: Simplify _eth_get_rss_ex_dst_addr() Philippe Mathieu-Daudé
2021-03-10 18:31 ` [PATCH v6 3/7] net/eth: Better describe _eth_get_rss_ex_dst_addr's offset argument Philippe Mathieu-Daudé
2021-03-10 18:31 ` Philippe Mathieu-Daudé [this message]
2021-03-10 18:31 ` [PATCH v6 5/7] net/eth: Check iovec has enough data earlier Philippe Mathieu-Daudé
2021-03-10 18:31 ` [PATCH v6 6/7] net/eth: Read ip6_ext_hdr_routing buffer before accessing it Philippe Mathieu-Daudé
2021-03-17 16:33 ` Alexander Bulekov
2021-03-17 16:35 ` Alexander Bulekov
2021-03-17 16:42 ` Philippe Mathieu-Daudé
2021-03-17 16:47 ` Alexander Bulekov
2021-03-10 18:31 ` [PATCH v6 7/7] net/eth: Add an assert() and invert if() statement to simplify code Philippe Mathieu-Daudé
2021-03-11 7:52 ` [PATCH v6 0/7] net/eth: Fix stack-buffer-overflow in _eth_get_rss_ex_dst_addr() Miroslav Rezanina
2021-03-22 7:27 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210310183123.1212612-5-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=dmitry.fleytman@gmail.com \
--cc=jasowang@redhat.com \
--cc=lvivier@redhat.com \
--cc=mrezanin@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sgarzare@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).