Commit 234d72ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-7.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging driver fixes from Greg KH:
 "Here are two small staging driver fixes for 7.1-rc3.  They are:

   - vme_user root device leak fix

   - NULL dereference bugfix in the rtl8723bs driver

  Both of these have been in linux-next all this week with no reported
  issues"

* tag 'staging-7.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: rtl8723bs: os_dep: avoid NULL pointer dereference in rtw_cbuf_alloc
  staging: vme_user: fix root device leak on init failure
parents fe3e5bc9 bc851db0

drivers/staging/rtl8723bs/os_dep/osdep_service.c

+2 −1
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ struct rtw_cbuf *rtw_cbuf_alloc(u32 size) 
	struct rtw_cbuf *cbuf;



	cbuf = kzalloc_flex(*cbuf, bufs, size);

	if (cbuf)

		cbuf->size = size;



	return cbuf;

drivers/staging/vme_user/vme_fake.c

+2 −0
Original line number Diff line number Diff line
@@ -1230,6 +1230,8 @@ static int __init fake_init(void) 
err_driver:

	kfree(fake_bridge);

err_struct:

	root_device_unregister(vme_root);



	return retval;

}