Skip to content

Commit 7cc25f6

Browse files
committed
can-host: Fix crash when 'canbus' property is not set
Providing the 'if' property, but not 'canbus' segfaults like this: #0 0x0000555555b0f14d in can_bus_insert_client (bus=0x0, client=0x555556aa9af0) at ../net/can/can_core.c:88 #1 0x00005555559c3803 in can_host_connect (ch=0x555556aa9ac0, errp=0x7fffffffd568) at ../net/can/can_host.c:62 #2 0x00005555559c386a in can_host_complete (uc=0x555556aa9ac0, errp=0x7fffffffd568) at ../net/can/can_host.c:72 #3 0x0000555555d52de9 in user_creatable_complete (uc=0x555556aa9ac0, errp=0x7fffffffd5c8) at ../qom/object_interfaces.c:23 Add the missing NULL check. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20201130105615.21799-5-kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
1 parent f0947dc commit 7cc25f6

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

net/can/can_host.c

+5
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ static void can_host_connect(CanHostState *ch, Error **errp)
5353
CanHostClass *chc = CAN_HOST_GET_CLASS(ch);
5454
Error *local_err = NULL;
5555

56+
if (ch->bus == NULL) {
57+
error_setg(errp, "'canbus' property not set");
58+
return;
59+
}
60+
5661
chc->connect(ch, &local_err);
5762
if (local_err) {
5863
error_propagate(errp, local_err);

0 commit comments

Comments
 (0)