diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-09 18:26:08 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-09 18:26:08 +0300 |
| commit | 234d72ae02e48cd0cf0f6e8f8f7d57c0cf7bcc66 (patch) | |
| tree | 1f344ede1d3e71b3187705d521df8604cbf8c395 | |
| parent | fe3e5bc9e3c280017d4ba05d7fcc8997029e53cd (diff) | |
| parent | bc851db06045a40c18233dd76ef0562d7f8bb6db (diff) | |
| download | linux-234d72ae02e48cd0cf0f6e8f8f7d57c0cf7bcc66.tar.xz | |
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
| -rw-r--r-- | drivers/staging/rtl8723bs/os_dep/osdep_service.c | 3 | ||||
| -rw-r--r-- | drivers/staging/vme_user/vme_fake.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/rtl8723bs/os_dep/osdep_service.c b/drivers/staging/rtl8723bs/os_dep/osdep_service.c index 7959daeabc6f..4cfdf7c62344 100644 --- a/drivers/staging/rtl8723bs/os_dep/osdep_service.c +++ b/drivers/staging/rtl8723bs/os_dep/osdep_service.c @@ -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; } diff --git a/drivers/staging/vme_user/vme_fake.c b/drivers/staging/vme_user/vme_fake.c index be4ad47ed526..8abaa3165fbb 100644 --- a/drivers/staging/vme_user/vme_fake.c +++ b/drivers/staging/vme_user/vme_fake.c @@ -1230,6 +1230,8 @@ err_master: err_driver: kfree(fake_bridge); err_struct: + root_device_unregister(vme_root); + return retval; } |