From: Roman Penyaev <r.peniaev@gmail.com>
Cc: "Roman Penyaev" <r.peniaev@gmail.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Clément Mathieu--Drif" <clement.mathieu--drif@eviden.com>,
qemu-devel@nongnu.org
Subject: [PATCH v3 1/2] chardev/char-mux: shift unsigned long to avoid 32-bit overflow
Date: Fri, 29 Nov 2024 11:32:38 +0100 [thread overview]
Message-ID: <20241129103239.464061-2-r.peniaev@gmail.com> (raw)
In-Reply-To: <20241129103239.464061-1-r.peniaev@gmail.com>
Allthough the size of MAX_MUX is equal to 4 and likely will never
change, this patch changes type of constant to unsigned long to
be on the safe side.
Also add a static compile check that MAX_MUX never bigger than
`sizeof(d->mux_bitset) * BITS_PER_BYTE`.
Signed-off-by: Roman Penyaev <r.peniaev@gmail.com>
Reviewed-by: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Clément Mathieu--Drif <clement.mathieu--drif@eviden.com>
Cc: qemu-devel@nongnu.org
---
chardev/char-mux.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/chardev/char-mux.c b/chardev/char-mux.c
index bda5c45e6058..9d67b8bd9ab8 100644
--- a/chardev/char-mux.c
+++ b/chardev/char-mux.c
@@ -316,6 +316,8 @@ bool mux_chr_attach_frontend(MuxChardev *d, CharBackend *b,
{
unsigned int bit;
+ QEMU_BUILD_BUG_ON(MAX_MUX > (sizeof(d->mux_bitset) * BITS_PER_BYTE));
+
bit = find_next_zero_bit(&d->mux_bitset, MAX_MUX, 0);
if (bit >= MAX_MUX) {
error_setg(errp,
@@ -325,7 +327,7 @@ bool mux_chr_attach_frontend(MuxChardev *d, CharBackend *b,
return false;
}
- d->mux_bitset |= (1 << bit);
+ d->mux_bitset |= (1ul << bit);
d->backends[bit] = b;
*tag = bit;
@@ -341,7 +343,7 @@ bool mux_chr_detach_frontend(MuxChardev *d, unsigned int tag)
return false;
}
- d->mux_bitset &= ~(1 << bit);
+ d->mux_bitset &= ~(1ul << bit);
d->backends[bit] = NULL;
return true;
--
2.34.1
next prev parent reply other threads:[~2024-11-29 10:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-29 10:32 [PATCH v3 0/2] chardev/char-mux: tweak mux bitset operations Roman Penyaev
2024-11-29 10:32 ` Roman Penyaev [this message]
2024-11-29 10:32 ` [PATCH v3 2/2] chardev/char-mux: make boolean bit check instead of find_next_bit() Roman Penyaev
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=20241129103239.464061-2-r.peniaev@gmail.com \
--to=r.peniaev@gmail.com \
--cc=clement.mathieu--drif@eviden.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--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).