Skip to content

Commit

Permalink
usbip: usbip_host: fix bad unlock balance during stub_probe()
Browse files Browse the repository at this point in the history
commit c171654 upstream.

stub_probe() calls put_busid_priv() in an error path when device isn't
found in the busid_table. Fix it by making put_busid_priv() safe to be
called with null struct bus_id_priv pointer.

This problem happens when "usbip bind" is run without loading usbip_host
driver and then running modprobe. The first failed bind attempt unbinds
the device from the original driver and when usbip_host is modprobed,
stub_probe() runs and doesn't find the device in its busid table and calls
put_busid_priv(0 with null bus_id_priv pointer.

usbip-host 3-10.2: 3-10.2 is not in match_busid table...  skip!

[  367.359679] =====================================
[  367.359681] WARNING: bad unlock balance detected!
[  367.359683] 4.17.0-rc4+ #5 Not tainted
[  367.359685] -------------------------------------
[  367.359688] modprobe/2768 is trying to release lock (
[  367.359689]
==================================================================
[  367.359696] BUG: KASAN: null-ptr-deref in print_unlock_imbalance_bug+0x99/0x110
[  367.359699] Read of size 8 at addr 0000000000000058 by task modprobe/2768

[  367.359705] CPU: 4 PID: 2768 Comm: modprobe Not tainted 4.17.0-rc4+ #5

Fixes: 2207655 ("usbip: usbip_host: fix NULL-ptr deref and use-after-free errors") in usb-linus
Signed-off-by: Shuah Khan (Samsung OSG) <[email protected]>
Cc: stable <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
Shuah Khan (Samsung OSG) authored and gregkh committed May 22, 2018
1 parent ec0c939 commit e842726
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/usb/usbip/stub_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ struct bus_id_priv *get_busid_priv(const char *busid)

void put_busid_priv(struct bus_id_priv *bid)
{
spin_unlock(&bid->busid_lock);
if (bid)
spin_unlock(&bid->busid_lock);
}

static int add_match_busid(char *busid)
Expand Down

0 comments on commit e842726

Please sign in to comment.