All of lore.kernel.org
 help / color / mirror / Atom feed
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>, "Li Qiang" <liq3ea@gmail.com>,
	"Alexander Bulekov" <alxndr@bu.edu>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Miroslav Rezanina" <mrezanin@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Stefano Garzarella" <sgarzare@redhat.com>
Subject: [PATCH v4 6/6] net/eth: Return earlier in _eth_get_rss_ex_dst_addr()
Date: Tue,  9 Mar 2021 19:27:09 +0100	[thread overview]
Message-ID: <20210309182709.810955-7-philmd@redhat.com> (raw)
In-Reply-To: <20210309182709.810955-1-philmd@redhat.com>

Slightly simplify _eth_get_rss_ex_dst_addr() by returning earlier.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 net/eth.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/net/eth.c b/net/eth.c
index e984edcfb0b..b44439d31c5 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -407,23 +407,21 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags,
 {
     size_t input_size = iov_size(pkt, pkt_frags);
     struct ip6_ext_hdr_routing *rthdr;
+    size_t bytes_read;
 
     if (input_size < ext_hdr_offset + sizeof(*rthdr)) {
         return false;
     }
     rthdr = (struct ip6_ext_hdr_routing *) ext_hdr;
 
-    if ((rthdr->rtype == 2) && (rthdr->segleft == 1)) {
-        size_t bytes_read;
-
-        bytes_read = iov_to_buf(pkt, pkt_frags,
-                                ext_hdr_offset + sizeof(*ext_hdr),
-                                dst_addr, sizeof(*dst_addr));
-
-        return bytes_read == sizeof(*dst_addr);
+    if ((rthdr->rtype != 2) || (rthdr->segleft != 1)) {
+        return false;
     }
 
-    return false;
+    bytes_read = iov_to_buf(pkt, pkt_frags, ext_hdr_offset + sizeof(*ext_hdr),
+                            dst_addr, sizeof(*dst_addr));
+
+    return bytes_read == sizeof(*dst_addr);
 }
 
 static bool
-- 
2.26.2



  parent reply	other threads:[~2021-03-09 20:13 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-09 18:27 [PATCH v4 0/6] net/eth: Fix stack-buffer-overflow in _eth_get_rss_ex_dst_addr() Philippe Mathieu-Daudé
2021-03-09 18:27 ` [PATCH v4 1/6] net/eth: Simplify _eth_get_rss_ex_dst_addr() Philippe Mathieu-Daudé
2021-03-09 18:27 ` [PATCH v4 2/6] net/eth: Better describe _eth_get_rss_ex_dst_addr's offset argument Philippe Mathieu-Daudé
2021-03-10  8:41   ` Stefano Garzarella
2021-03-09 18:27 ` [PATCH v4 3/6] net/eth: Initialize input_size variable earlier Philippe Mathieu-Daudé
2021-03-10  8:41   ` Stefano Garzarella
2021-03-09 18:27 ` [PATCH v4 4/6] net/eth: Check rt_hdr size before casting to ip6_ext_hdr Philippe Mathieu-Daudé
2021-03-10  9:05   ` Stefano Garzarella
2021-03-10  9:35     ` Stefano Garzarella
2021-03-10  9:36   ` Miroslav Rezanina
2021-03-10 12:34     ` Philippe Mathieu-Daudé
2021-03-09 18:27 ` [PATCH v4 5/6] net/eth: Remove now useless size check Philippe Mathieu-Daudé
2021-03-09 18:27 ` Philippe Mathieu-Daudé [this message]
2021-03-10  9:32   ` [PATCH v4 6/6] net/eth: Return earlier in _eth_get_rss_ex_dst_addr() Stefano Garzarella

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=20210309182709.810955-7-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=alxndr@bu.edu \
    --cc=dmitry.fleytman@gmail.com \
    --cc=jasowang@redhat.com \
    --cc=liq3ea@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.