From: Hang Zhang <zh.nvgt@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Daniel Vetter <daniel@ffwll.ch>, Helge Deller <deller@gmx.de>,
Javier Martinez Canillas <javierm@redhat.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Sam Ravnborg <sam@ravnborg.org>,
Alex Deucher <alexander.deucher@amd.com>,
linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, Hang Zhang <zh.nvgt@gmail.com>
Subject: [PATCH] fbmem: prevent potential use-after-free issues with console_lock()
Date: Thu, 29 Dec 2022 22:35:28 -0800 [thread overview]
Message-ID: <20221230063528.41037-1-zh.nvgt@gmail.com> (raw)
In do_fb_ioctl(), user specified "fb_info" can be freed in the callee
fbcon_get_con2fb_map_ioctl() -> set_con2fb_map() ->
con2fb_release_oldinfo(), this free operation is protected by
console_lock() in fbcon_set_con2fb_map_ioctl(), it also results in
the change of certain states such as "minfo->dead" in matroxfb_remove(),
so that it can be checked to avoid use-after-free before the use sites
(e.g., the check at the beginning of matroxfb_ioctl()). However,
the problem is that the use site is not protected by the same locks
as for the free operation, e.g., "default" case in do_fb_ioctl()
can lead to "matroxfb_ioctl()" but it's not protected by console_lock(),
which can invalidate the aforementioned state set and check in a
concurrent setting.
Prevent the potential use-after-free issues by protecting the "default"
case in do_fb_ioctl() with console_lock(), similarly as for many other
cases like "case FBIOBLANK" and "case FBIOPAN_DISPLAY".
Signed-off-by: Hang Zhang <zh.nvgt@gmail.com>
---
drivers/video/fbdev/core/fbmem.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index 1e70d8c67653..8b1a1527d18a 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1182,6 +1182,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
console_unlock();
break;
default:
+ console_lock();
lock_fb_info(info);
fb = info->fbops;
if (fb->fb_ioctl)
@@ -1189,6 +1190,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
else
ret = -ENOTTY;
unlock_fb_info(info);
+ console_unlock();
}
return ret;
}
--
2.39.0
WARNING: multiple messages have this Message-ID (diff)
From: Hang Zhang <zh.nvgt@gmail.com>
Cc: linux-fbdev@vger.kernel.org, Hang Zhang <zh.nvgt@gmail.com>,
Helge Deller <deller@gmx.de>,
Javier Martinez Canillas <javierm@redhat.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Thomas Zimmermann <tzimmermann@suse.de>,
Alex Deucher <alexander.deucher@amd.com>,
Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH] fbmem: prevent potential use-after-free issues with console_lock()
Date: Thu, 29 Dec 2022 22:35:28 -0800 [thread overview]
Message-ID: <20221230063528.41037-1-zh.nvgt@gmail.com> (raw)
In do_fb_ioctl(), user specified "fb_info" can be freed in the callee
fbcon_get_con2fb_map_ioctl() -> set_con2fb_map() ->
con2fb_release_oldinfo(), this free operation is protected by
console_lock() in fbcon_set_con2fb_map_ioctl(), it also results in
the change of certain states such as "minfo->dead" in matroxfb_remove(),
so that it can be checked to avoid use-after-free before the use sites
(e.g., the check at the beginning of matroxfb_ioctl()). However,
the problem is that the use site is not protected by the same locks
as for the free operation, e.g., "default" case in do_fb_ioctl()
can lead to "matroxfb_ioctl()" but it's not protected by console_lock(),
which can invalidate the aforementioned state set and check in a
concurrent setting.
Prevent the potential use-after-free issues by protecting the "default"
case in do_fb_ioctl() with console_lock(), similarly as for many other
cases like "case FBIOBLANK" and "case FBIOPAN_DISPLAY".
Signed-off-by: Hang Zhang <zh.nvgt@gmail.com>
---
drivers/video/fbdev/core/fbmem.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index 1e70d8c67653..8b1a1527d18a 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1182,6 +1182,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
console_unlock();
break;
default:
+ console_lock();
lock_fb_info(info);
fb = info->fbops;
if (fb->fb_ioctl)
@@ -1189,6 +1190,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
else
ret = -ENOTTY;
unlock_fb_info(info);
+ console_unlock();
}
return ret;
}
--
2.39.0
next reply other threads:[~2022-12-30 6:36 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-30 6:35 Hang Zhang [this message]
2022-12-30 6:35 ` [PATCH] fbmem: prevent potential use-after-free issues with console_lock() Hang Zhang
2023-01-02 15:28 ` Helge Deller
2023-01-02 15:28 ` Helge Deller
2023-01-05 10:21 ` Daniel Vetter
2023-01-05 10:21 ` Daniel Vetter
2023-01-05 10:25 ` Daniel Vetter
2023-01-05 10:25 ` Daniel Vetter
2023-01-05 18:38 ` Hang Zhang
2023-01-05 18:38 ` Hang Zhang
2023-01-06 18:59 ` Daniel Vetter
2023-01-06 18:59 ` Daniel Vetter
2023-01-06 19:58 ` Hang Zhang
2023-01-06 19:58 ` Hang Zhang
2023-01-06 20:05 ` Daniel Vetter
2023-01-06 20:05 ` Daniel Vetter
2023-01-06 20:25 ` Hang Zhang
2023-01-06 20:25 ` Hang Zhang
2023-01-06 21:19 ` Daniel Vetter
2023-01-06 21:19 ` Daniel Vetter
2023-01-06 22:12 ` Hang Zhang
2023-01-06 22:12 ` Hang Zhang
2023-01-06 22:46 ` Daniel Vetter
2023-01-06 22:46 ` Daniel Vetter
2023-01-06 23:19 ` Hang Zhang
2023-01-06 23:19 ` Hang Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221230063528.41037-1-zh.nvgt@gmail.com \
--to=zh.nvgt@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=daniel@ffwll.ch \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=javierm@redhat.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sam@ravnborg.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.