Skip to content

Commit

Permalink
can-host: Fix crash when 'canbus' property is not set
Browse files Browse the repository at this point in the history
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 <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Kevin Wolf <[email protected]>
  • Loading branch information
kevmw committed Dec 11, 2020
1 parent f0947dc commit 7cc25f6
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions net/can/can_host.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ static void can_host_connect(CanHostState *ch, Error **errp)
CanHostClass *chc = CAN_HOST_GET_CLASS(ch);
Error *local_err = NULL;

if (ch->bus == NULL) {
error_setg(errp, "'canbus' property not set");
return;
}

chc->connect(ch, &local_err);
if (local_err) {
error_propagate(errp, local_err);
Expand Down

0 comments on commit 7cc25f6

Please sign in to comment.