From: Yunseong Kim <yskelg@xxxxxxxxx> This patch handle potential null pointer dereference in 'raw3270_setup_device()', When 'raw3270_setup_console()' fails to allocate memory for 'rp' or 'ascebc'. Signed-off-by: Yunseong Kim <yskelg@xxxxxxxxx> --- drivers/s390/char/raw3270.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c index c57694be9bd3..4e81040eea81 100644 --- a/drivers/s390/char/raw3270.c +++ b/drivers/s390/char/raw3270.c @@ -812,7 +812,13 @@ struct raw3270 __init *raw3270_setup_console(void) return ERR_CAST(cdev); rp = kzalloc(sizeof(*rp), GFP_KERNEL | GFP_DMA); + if (!rp) + return ERR_PTR(-ENOMEM); ascebc = kzalloc(256, GFP_KERNEL); + if (!ascebc) { + kfree(rp); + return ERR_PTR(-ENOMEM); + } rc = raw3270_setup_device(cdev, rp, ascebc); if (rc) return ERR_PTR(rc); -- 2.45.2