diff options
| author | Kunwu Chan <chentao@kylinos.cn> | 2023-11-23 22:52:37 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-01-08 11:25:02 +0100 |
| commit | 27db23931d575ca7f3b017250b96ce9ee1c4959e (patch) | |
| tree | 0fa59c0a32afd4348298d0e49cb986e38b22bc5f | |
| parent | d05fea77e51c005c97cc9729cbe3b5005ee09a0a (diff) | |
| download | linux-stable-27db23931d575ca7f3b017250b96ce9ee1c4959e.tar.gz linux-stable-27db23931d575ca7f3b017250b96ce9ee1c4959e.tar.bz2 linux-stable-27db23931d575ca7f3b017250b96ce9ee1c4959e.zip | |
ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init
[ Upstream commit c72b9c33ef9695ad7ce7a6eb39a9df8a01b70796 ]
kasprintf() returns a pointer to dynamically allocated memory which can
be NULL upon failure. When 'soc_dev_attr->family' is NULL,it'll trigger
the null pointer dereference issue, such as in 'soc_info_show'.
And when 'soc_device_register' fails, it's necessary to release
'soc_dev_attr->family' to avoid memory leaks.
Fixes: 6770b2114325 ("ARM: OMAP2+: Export SoC information to userspace")
Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
Message-ID: <20231123145237.609442-1-chentao@kylinos.cn>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | arch/arm/mach-omap2/id.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 79d71b1eae59..1bc17fd49e48 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -784,10 +784,15 @@ void __init omap_soc_device_init(void) soc_dev_attr->machine = soc_name; soc_dev_attr->family = omap_get_family(); + if (!soc_dev_attr->family) { + kfree(soc_dev_attr); + return; + } soc_dev_attr->revision = soc_rev; soc_dev = soc_device_register(soc_dev_attr); if (IS_ERR(soc_dev)) { + kfree(soc_dev_attr->family); kfree(soc_dev_attr); return; } |