mirror of
https://github.com/torvalds/linux.git
synced 2026-05-12 16:18:45 +02:00
Staging driver fixes for 7.1-rc3
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. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCaf7ksA8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+yk3cACgjbF86RGquBMOmCvW0y05gLGXACsAoM4cOfQd Wel+rDTKUoa6FvreddHi =vHTv -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
234d72ae02
|
|
@ -194,7 +194,8 @@ struct rtw_cbuf *rtw_cbuf_alloc(u32 size)
|
|||
struct rtw_cbuf *cbuf;
|
||||
|
||||
cbuf = kzalloc_flex(*cbuf, bufs, size);
|
||||
cbuf->size = size;
|
||||
if (cbuf)
|
||||
cbuf->size = size;
|
||||
|
||||
return cbuf;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1230,6 +1230,8 @@ static int __init fake_init(void)
|
|||
err_driver:
|
||||
kfree(fake_bridge);
|
||||
err_struct:
|
||||
root_device_unregister(vme_root);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user