All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: Jason Wang <jasowang@redhat.com>,
	vsementsov@virtuozzo.com, armbru@redhat.com
Subject: [PATCH v4 1/5] net: Clarify early exit condition
Date: Wed, 13 Jan 2021 16:10:09 -0600	[thread overview]
Message-ID: <20210113221013.390592-2-eblake@redhat.com> (raw)
In-Reply-To: <20210113221013.390592-1-eblake@redhat.com>

On first glance, the loop in qmp_query_rx_filter() has early return
paths that could leak any allocation of filter_list from a previous
iteration.  But on closer inspection, it is obvious that all of the
early exits are guarded by has_name, and that the bulk of the loop
body can be executed at most once if the user is filtering by name,
thus, any early exit coincides with an empty list.  Add asserts to
make this obvious.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
 net/net.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/net.c b/net/net.c
index e1035f21d183..e581c8a26868 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1211,6 +1211,7 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,
         if (nc->info->type != NET_CLIENT_DRIVER_NIC) {
             if (has_name) {
                 error_setg(errp, "net client(%s) isn't a NIC", name);
+                assert(!filter_list);
                 return NULL;
             }
             continue;
@@ -1236,6 +1237,7 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,
         } else if (has_name) {
             error_setg(errp, "net client(%s) doesn't support"
                        " rx-filter querying", name);
+            assert(!filter_list);
             return NULL;
         }

-- 
2.30.0



  reply	other threads:[~2021-01-13 22:12 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-13 22:10 [PATCH v4 0/5] Common macros for QAPI list growth Eric Blake
2021-01-13 22:10 ` Eric Blake [this message]
2021-01-14  4:54   ` [PATCH v4 1/5] net: Clarify early exit condition Vladimir Sementsov-Ogievskiy
2021-01-19 16:08     ` Eric Blake
2021-01-13 22:10 ` [PATCH v4 2/5] qapi: A couple more QAPI_LIST_PREPEND() stragglers Eric Blake
2021-01-14  5:18   ` Vladimir Sementsov-Ogievskiy
2021-01-13 22:10 ` [PATCH v4 3/5] qapi: Introduce QAPI_LIST_APPEND Eric Blake
2021-01-14 12:59   ` Markus Armbruster
2021-01-13 22:10 ` [PATCH v4 4/5] qapi: Use QAPI_LIST_APPEND in trivial cases Eric Blake
2021-01-13 22:10 ` [PATCH v4 5/5] qapi: More complex uses of QAPI_LIST_APPEND Eric Blake
2021-01-14 13:08   ` Markus Armbruster
2021-01-26  9:31   ` Markus Armbruster
2021-01-27 18:12     ` Eric Blake
2021-01-28  7:45       ` Markus Armbruster
2021-02-05 17:13     ` Eric Blake
2021-01-14 13:15 ` [PATCH v4 0/5] Common macros for QAPI list growth Markus Armbruster

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=20210113221013.390592-2-eblake@redhat.com \
    --to=eblake@redhat.com \
    --cc=armbru@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=vsementsov@virtuozzo.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.