From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 8 Oct 2020 20:27:12 +0000 (-0400)
Subject: can-host-socketcan: Fix crash when 'if' option is not set
X-Git-Tag: v5.2.0-rc0~55^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9753cca6b0db724bc6d15e60cfad1705f800b96;p=thirdparty%2Fqemu.git

can-host-socketcan: Fix crash when 'if' option is not set

Fix the following crash:

  $ qemu-system-x86_64 -object can-host-socketcan,id=obj0
  Segmentation fault (core dumped)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Acked-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Message-Id: <20201008202713.1416823-3-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---

diff --git a/net/can/can_socketcan.c b/net/can/can_socketcan.c
index 92b1f79385e..4b68f60c6b6 100644
--- a/net/can/can_socketcan.c
+++ b/net/can/can_socketcan.c
@@ -194,6 +194,11 @@ static void can_host_socketcan_connect(CanHostState *ch, Error **errp)
     struct sockaddr_can addr;
     struct ifreq ifr;
 
+    if (!c->ifname) {
+        error_setg(errp, "'if' property not set");
+        return;
+    }
+
     /* open socket */
     s = qemu_socket(PF_CAN, SOCK_RAW, CAN_RAW);
     if (s < 0) {