s390: raw3270: Handle allocation failures
Subsystems (2)
PATCH v2 1/1 s390: raw3270: Handle allocation failures
Check the return values of kzalloc_obj() and kzalloc() before using the allocated memory. Free the allocated resources on subsequent initialization failures to avoid leaking memory.
---
Changes in v2:
- Destroy the console device on allocation failure.
- Do not free rp after raw3270_setup_device() success.
--- drivers/s390/char/raw3270.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/s390/char/raw3270.c +14 -1
@@ -814,10 +814,23 @@ struct raw3270 __init *raw3270_setup_console(void)return ERR_CAST (cdev); rp =kzalloc_obj (*rp,GFP_KERNEL |GFP_DMA ); +if (!rp) { +ccw_device_destroy_console (cdev); +return ERR_PTR (-ENOMEM ); + } ascebc =kzalloc (256 ,GFP_KERNEL ); +if (!ascebc) { +ccw_device_destroy_console (cdev); +kfree (rp); +return ERR_PTR (-ENOMEM ); + } rc =raw3270_setup_device (cdev, rp, ascebc); -if (rc) +if (rc) { +ccw_device_destroy_console (cdev); +kfree (rp->ascebc); +kfree (rp);return ERR_PTR (rc); + }set_bit (RAW3270_FLAGS_CONSOLE , &rp->flags); rc =ccw_device_enable_console (cdev);
Signature · 1 line
2.53.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Pre-existing issues:
- [High] Dangling pointer and Use-After-Free if ccw_device_enable_console() fails in raw3270_setup_console().
- [High] Device reference count leak in raw3270_create_device() on error path.
--
--- Patch [1]: [PATCH v2] s390: raw3270: Handle allocation failures --- commit 0dc799bc2a1ab261a4df0f1061360db8eed525e2
Author: Triet Hoang <[email protected]>
s390: raw3270: Handle allocation failures
Check the return values of kzalloc_obj() and kzalloc() before using the allocated memory. Free the allocated resources on subsequent initialization failures to avoid leaking memory.
Quoted 19 lines
drivers/s390/char/raw3270.c +9
-0@@ -814,10 +814,23 @@ struct raw3270 __init *raw3270_setup_console(void)return ERR_CAST (cdev); rp =kzalloc_obj (*rp,GFP_KERNEL |GFP_DMA ); +if (!rp) { +ccw_device_destroy_console (cdev); +return ERR_PTR (-ENOMEM ); + } ascebc =kzalloc (256 ,GFP_KERNEL ); +if (!ascebc) { +ccw_device_destroy_console (cdev); +kfree (rp); +return ERR_PTR (-ENOMEM ); + } rc =raw3270_setup_device (cdev, rp, ascebc);
drivers/s390/char/raw3270.c struct raw3270 __init *raw3270_setup_console(void) · line 836
Quoted 10 lines
drivers/s390/char/raw3270.c +5
-1-if (rc) +if (rc) { +ccw_device_destroy_console (cdev); +kfree (rp->ascebc); +kfree (rp);return ERR_PTR (rc); + }set_bit (RAW3270_FLAGS_CONSOLE , &rp->flags); rc =ccw_device_enable_console (cdev);
[Severity: High]
This isn't a bug introduced by this patch, but if ccw_device_enable_console() fails just below this context:
drivers/s390/char/raw3270.c:raw3270_setup_console() {
...
rc = ccw_device_enable_console(cdev);
if (rc) {
ccw_device_destroy_console(cdev);
return ERR_PTR(rc);
}
...
}This error path destroys the cdev but fails to unlink rp from raw3270_devices or free it.
Because raw3270_setup_device() previously added rp to the global list here:
drivers/s390/char/raw3270.c:raw3270_setup_device() {
...
if (rp->minor == -1 && minor < RAW3270_MAXDEVS + RAW3270_FIRSTMINOR) {
rp->minor = minor;
list_add_tail(&rp->list, &raw3270_devices);
}
...
}Does leaving it linked in raw3270_devices create a dangling pointer where rp->cdev points to the destroyed console device?
Later, when raw3270_init() iterates over this list, it could dereference rp->cdev->dev, causing a use-after-free.
I also noticed a pre-existing resource leak in the same file:
drivers/s390/char/raw3270.c:raw3270_create_device() {
...
rc = raw3270_setup_device(cdev, rp, ascebc);
if (rc) {
kfree(rp->ascebc);
kfree(rp);
rp = ERR_PTR(rc);
}
/* Get reference to ccw_device structure. */
get_device(&cdev->dev);
return rp;
}[Severity: High]
This is a pre-existing issue, but does this leak a device reference count when raw3270_setup_device() fails?
If raw3270_setup_device() fails, the function continues to unconditionally execute get_device(&cdev->dev) before returning the error pointer.
The caller, raw3270_set_online(), receives the error and returns immediately, meaning put_device() is never called to balance it.
Can this permanently leak a reference to the ccw_device, preventing the physical device's structures from being freed even if hot-removed?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 3 lines
Check the return values of
kzalloc_obj()andkzalloc()before using the allocated memory. Free the allocated resources on subsequent initialization failures to avoid leaking memory.
* How do you think about to add any tags (like “Fixes” and “Cc”) accordingly?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v7.2#n145
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/stable-kernel-rules.rst?h=v7.2#n34
* Please avoid duplicate source code also for an improved implementation of the function “raw3270_setup_console”.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/coding-style.rst?h=v7.2#n526
https://elixir.bootlin.com/linux/v7.2/source/drivers/s390/char/raw3270.c#L802-L839
* How do you think about to increase the application of scope-based resource management?
Regards,
Markus