summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuoming Zhou <duoming@zju.edu.cn>2024-03-06 17:12:59 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-06-16 13:23:34 +0200
commitd2640251f94078e1dcf0a26b1815601f6dbd5440 (patch)
treee2284eaaf922c952f988713be437ab2c2159dd20
parent732e700a1689fbdb8ac94faeb7765e81456b0a95 (diff)
downloadlinux-stable-d2640251f94078e1dcf0a26b1815601f6dbd5440.tar.gz
linux-stable-d2640251f94078e1dcf0a26b1815601f6dbd5440.tar.bz2
linux-stable-d2640251f94078e1dcf0a26b1815601f6dbd5440.zip
um: Fix return value in ubd_init()
[ Upstream commit 31a5990ed253a66712d7ddc29c92d297a991fdf2 ] When kmalloc_array() fails to allocate memory, the ubd_init() should return -ENOMEM instead of -1. So, fix it. Fixes: f88f0bdfc32f ("um: UBD Improvements") Signed-off-by: Duoming Zhou <duoming@zju.edu.cn> Reviewed-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--arch/um/drivers/ubd_kern.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 788c80abff5d..4a32df89a491 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -1135,7 +1135,7 @@ static int __init ubd_init(void)
if (irq_req_buffer == NULL) {
printk(KERN_ERR "Failed to initialize ubd buffering\n");
- return -1;
+ return -ENOMEM;
}
io_req_buffer = kmalloc_array(UBD_REQ_BUFFER_SIZE,
sizeof(struct io_thread_req *),
@@ -1146,7 +1146,7 @@ static int __init ubd_init(void)
if (io_req_buffer == NULL) {
printk(KERN_ERR "Failed to initialize ubd buffering\n");
- return -1;
+ return -ENOMEM;
}
platform_driver_register(&ubd_driver);
mutex_lock(&ubd_lock);