]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
um: rtc: Avoid shadowing err in uml_rtc_start()
authorTiwei Bie <tiwei.btw@antgroup.com>
Tue, 8 Jul 2025 09:04:03 +0000 (17:04 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Aug 2025 14:38:45 +0000 (16:38 +0200)
[ Upstream commit 4c916e3b224a02019b3cc3983a15f32bfd9a22df ]

Remove the declaration of 'err' inside the 'if (timetravel)' block,
as it would otherwise be unavailable outside that block, potentially
leading to uml_rtc_start() returning an uninitialized value.

Fixes: dde8b58d5127 ("um: add a pseudo RTC")
Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
Link: https://patch.msgid.link/20250708090403.1067440-5-tiwei.bie@linux.dev
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/um/drivers/rtc_user.c

index 51e79f3148cd40776cc91d95a23ec263a9189ab4..67912fcf7b2864daa6539eaeaaa61f14dd08b4b7 100644 (file)
@@ -28,7 +28,7 @@ int uml_rtc_start(bool timetravel)
        int err;
 
        if (timetravel) {
-               int err = os_pipe(uml_rtc_irq_fds, 1, 1);
+               err = os_pipe(uml_rtc_irq_fds, 1, 1);
                if (err)
                        goto fail;
        } else {