commit bc38e31b4e0366f3a70c0939abde4c3dd6e0fa30
author Jason Wang <jasowang@redhat.com> Fri Apr 23 11:18:03 2021 +0800
committer Peter Maydell <peter.maydell@linaro.org> Fri Apr 23 11:11:28 2021 +0100
tree f8e330e2edb9005a327170cffa51cd0944673806
parent b1cffefa1b163bce9aebc3416f562c1d3886eeaa

net: check the existence of peer before trying to pad

There could be case that peer is NULL. This can happen when during
network device hot-add where net device needs to be added first. So
the patch check the existence of peer before trying to do the pad.

Fixes: 969e50b61a285 ("net: Pad short frames to minimum size before sending from SLiRP/TAP")
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Message-id: 20210423031803.1479-1-jasowang@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

net/slirp.c

diff --git a/net/slirp.c b/net/slirp.c
index a01a0fc..7a4e96d 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -119,7 +119,7 @@
     uint8_t min_pkt[ETH_ZLEN];
     size_t min_pktsz = sizeof(min_pkt);
 
-    if (!s->nc.peer->do_not_pad) {
+    if (net_peer_needs_padding(&s->nc)) {
         if (eth_pad_short_frame(min_pkt, &min_pktsz, pkt, pkt_len)) {
             pkt = min_pkt;
             pkt_len = min_pktsz;