aboutsummaryrefslogtreecommitdiff
path: root/hw/net
diff options
context:
space:
mode:
authorMauro Matteo Cascella <mcascell@redhat.com>2020-08-01 18:42:38 +0200
committerJason Wang <jasowang@redhat.com>2020-08-04 14:14:48 +0800
commit035e69b063835a5fd23cacabd63690a3d84532a8 (patch)
tree53675dd7702cd9c4c878d429f3e3c9e6544a7574 /hw/net
parentf81cddfe8abe7d7e2220e611ee69d2cdf34eb789 (diff)
downloadqemu-035e69b063835a5fd23cacabd63690a3d84532a8.zip
qemu-035e69b063835a5fd23cacabd63690a3d84532a8.tar.gz
qemu-035e69b063835a5fd23cacabd63690a3d84532a8.tar.bz2
hw/net/net_tx_pkt: fix assertion failure in net_tx_pkt_add_raw_fragment()
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> Reviewed-by: Dmitry Fleytman <dmitry.fleytman@gmail.com> Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'hw/net')
-rw-r--r--hw/net/net_tx_pkt.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
index 9560e4a..da262ed 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;