From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: "Jason Wang" <jasowang@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 11/13] net/eth: Check iovec has enough data earlier
Date: Mon, 22 Mar 2021 18:08:10 +0800 [thread overview]
Message-ID: <1616407692-693-12-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1616407692-693-1-git-send-email-jasowang@redhat.com>
From: Philippe Mathieu-Daudé <philmd@redhat.com>
We want to check fields from ip6_ext_hdr_routing structure
and if correct read the full in6_address. Let's directly check
if our iovec contains enough data for everything, else return
early.
Suggested-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/eth.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/eth.c b/net/eth.c
index 087aa71..6db943d 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -409,7 +409,7 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags,
size_t input_size = iov_size(pkt, pkt_frags);
size_t bytes_read;
- if (input_size < ext_hdr_offset + sizeof(*ext_hdr)) {
+ if (input_size < ext_hdr_offset + sizeof(*rthdr) + sizeof(*dst_addr)) {
return false;
}
--
2.7.4
next prev parent reply other threads:[~2021-03-22 10:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-22 10:07 [PULL 00/13] Net patches Jason Wang
2021-03-22 10:08 ` [PULL 01/13] net: eth: Add a helper to pad a short Ethernet frame Jason Wang
2021-03-22 10:08 ` [PULL 02/13] net: Add a 'do_not_pad" to NetClientState Jason Wang
2021-03-22 10:08 ` [PULL 03/13] net: Pad short frames to minimum size before sending from SLiRP/TAP Jason Wang
2021-03-22 10:08 ` [PULL 04/13] hw/net: virtio-net: Initialize nc->do_not_pad to true Jason Wang
2021-03-22 10:08 ` [PULL 05/13] net/colo-compare.c: Fix memory leak for non-tcp packet Jason Wang
2021-03-22 10:08 ` [PULL 06/13] net/colo-compare.c: Optimize removal of secondary packet Jason Wang
2021-03-22 10:08 ` [PULL 07/13] net/eth: Use correct in6_address offset in _eth_get_rss_ex_dst_addr() Jason Wang
2021-03-22 10:08 ` [PULL 08/13] net/eth: Simplify _eth_get_rss_ex_dst_addr() Jason Wang
2021-03-22 10:08 ` [PULL 09/13] net/eth: Better describe _eth_get_rss_ex_dst_addr's offset argument Jason Wang
2021-03-22 10:08 ` [PULL 10/13] net/eth: Check size earlier in _eth_get_rss_ex_dst_addr() Jason Wang
2021-03-22 10:08 ` Jason Wang [this message]
2021-03-22 10:08 ` [PULL 12/13] net/eth: Read ip6_ext_hdr_routing buffer before accessing it Jason Wang
2021-03-22 10:08 ` [PULL 13/13] net/eth: Add an assert() and invert if() statement to simplify code Jason Wang
2021-03-22 14:13 ` [PULL 00/13] Net patches Peter Maydell
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=1616407692-693-12-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).