* [PATCH v2] hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment()
@ 2020-08-01 16:42 Mauro Matteo Cascella
2020-08-02 14:43 ` Dmitry Fleytman
2020-08-04 6:01 ` Jason Wang
0 siblings, 2 replies; 3+ messages in thread
From: Mauro Matteo Cascella @ 2020-08-01 16:42 UTC (permalink / raw)
To: qemu-devel; +Cc: alxndr, jasowang, dmitry.fleytman, mcascell, ezrakiez
An assertion failure issue was found in the code that processes network packets
while adding data fragments into the packet context. It could be abused by a
malicious guest to abort the QEMU process on the host. This patch replaces the
affected assert() with a conditional statement, returning false if the current
data fragment exceeds max_raw_frags.
Reported-by: Alexander Bulekov <alxndr@bu.edu>
Reported-by: Ziming Zhang <ezrakiez@gmail.com>
Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
---
hw/net/net_tx_pkt.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
index 9560e4a49e..da262edc3e 100644
--- a/hw/net/net_tx_pkt.c
+++ b/hw/net/net_tx_pkt.c
@@ -379,7 +379,10 @@ bool net_tx_pkt_add_raw_fragment(struct NetTxPkt *pkt, hwaddr pa,
hwaddr mapped_len = 0;
struct iovec *ventry;
assert(pkt);
- assert(pkt->max_raw_frags > pkt->raw_frags);
+
+ if (pkt->raw_frags >= pkt->max_raw_frags) {
+ return false;
+ }
if (!len) {
return true;
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment()
2020-08-01 16:42 [PATCH v2] hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment() Mauro Matteo Cascella
@ 2020-08-02 14:43 ` Dmitry Fleytman
2020-08-04 6:01 ` Jason Wang
1 sibling, 0 replies; 3+ messages in thread
From: Dmitry Fleytman @ 2020-08-02 14:43 UTC (permalink / raw)
To: Mauro Matteo Cascella
Cc: Alexander Bulekov, Jason Wang, QEMU Developers, ezrakiez
> On 1 Aug 2020, at 19:42, Mauro Matteo Cascella <mcascell@redhat.com> wrote:
>
> An assertion failure issue was found in the code that processes network packets
> while adding data fragments into the packet context. It could be abused by a
> malicious guest to abort the QEMU process on the host. This patch replaces the
> affected assert() with a conditional statement, returning false if the current
> data fragment exceeds max_raw_frags.
>
Reviewed-by: Dmitry Fleytman <dmitry.fleytman@gmail.com>
> Reported-by: Alexander Bulekov <alxndr@bu.edu>
> Reported-by: Ziming Zhang <ezrakiez@gmail.com>
> Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
> ---
> hw/net/net_tx_pkt.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
> index 9560e4a49e..da262edc3e 100644
> --- a/hw/net/net_tx_pkt.c
> +++ b/hw/net/net_tx_pkt.c
> @@ -379,7 +379,10 @@ bool net_tx_pkt_add_raw_fragment(struct NetTxPkt *pkt, hwaddr pa,
> hwaddr mapped_len = 0;
> struct iovec *ventry;
> assert(pkt);
> - assert(pkt->max_raw_frags > pkt->raw_frags);
> +
> + if (pkt->raw_frags >= pkt->max_raw_frags) {
> + return false;
> + }
>
> if (!len) {
> return true;
> --
> 2.26.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment()
2020-08-01 16:42 [PATCH v2] hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment() Mauro Matteo Cascella
2020-08-02 14:43 ` Dmitry Fleytman
@ 2020-08-04 6:01 ` Jason Wang
1 sibling, 0 replies; 3+ messages in thread
From: Jason Wang @ 2020-08-04 6:01 UTC (permalink / raw)
To: Mauro Matteo Cascella, qemu-devel; +Cc: alxndr, dmitry.fleytman, ezrakiez
On 2020/8/2 上午12:42, Mauro Matteo Cascella wrote:
> An assertion failure issue was found in the code that processes network packets
> while adding data fragments into the packet context. It could be abused by a
> malicious guest to abort the QEMU process on the host. This patch replaces the
> affected assert() with a conditional statement, returning false if the current
> data fragment exceeds max_raw_frags.
>
> Reported-by: Alexander Bulekov <alxndr@bu.edu>
> Reported-by: Ziming Zhang <ezrakiez@gmail.com>
> Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
> ---
> hw/net/net_tx_pkt.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
> index 9560e4a49e..da262edc3e 100644
> --- a/hw/net/net_tx_pkt.c
> +++ b/hw/net/net_tx_pkt.c
> @@ -379,7 +379,10 @@ bool net_tx_pkt_add_raw_fragment(struct NetTxPkt *pkt, hwaddr pa,
> hwaddr mapped_len = 0;
> struct iovec *ventry;
> assert(pkt);
> - assert(pkt->max_raw_frags > pkt->raw_frags);
> +
> + if (pkt->raw_frags >= pkt->max_raw_frags) {
> + return false;
> + }
>
> if (!len) {
> return true;
Applied.
Thanks
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-04 6:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-01 16:42 [PATCH v2] hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment() Mauro Matteo Cascella
2020-08-02 14:43 ` Dmitry Fleytman
2020-08-04 6:01 ` Jason Wang
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.