diff options
| author | Kees Cook | 2018-02-27 01:04:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-02-27 10:17:33 +0100 |
| commit | c396a5bf457fb60159dcedbd4f48d53a62be030a (patch) | |
| tree | 7204e7a8f557baf359c0788796658997614d8a58 /drivers/video/fbdev/core | |
| parent | console: Fill in struct consw argument names (diff) | |
| download | kernel-qcow2-linux-c396a5bf457fb60159dcedbd4f48d53a62be030a.tar.gz kernel-qcow2-linux-c396a5bf457fb60159dcedbd4f48d53a62be030a.tar.xz kernel-qcow2-linux-c396a5bf457fb60159dcedbd4f48d53a62be030a.zip | |
console: Expand dummy functions for CFI
This expands the no-op dummy functions into full prototypes to avoid
indirect call mismatches when running under Control Flow Integrity
checking, like with Clang's -fsanitize=cfi.
Co-Developed-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/fbdev/core')
| -rw-r--r-- | drivers/video/fbdev/core/fbcon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 5baf7bc054e1..3e330e0f56ed 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -2595,7 +2595,8 @@ static int fbcon_copy_font(struct vc_data *vc, int con) * is ever implemented. */ -static int fbcon_set_font(struct vc_data *vc, struct console_font *font, unsigned flags) +static int fbcon_set_font(struct vc_data *vc, struct console_font *font, + unsigned int flags) { struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]]; unsigned charcount = font->charcount; |