Commit a641261e authored by Kees Cook's avatar Kees Cook Committed by Bartlomiej Zolnierkiewicz

video: fbdev: matroxfb: use designated initializers

Prepare to mark sensitive kernel structures for randomization by making
sure they're using designated initializers. These were identified during
allyesconfig builds of x86, arm, and arm64, with most initializer fixes
extracted from grsecurity.
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 6895aff4
...@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo) ...@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
#ifdef CONFIG_FB_MATROX_MYSTIQUE #ifdef CONFIG_FB_MATROX_MYSTIQUE
struct matrox_switch matrox_mystique = { struct matrox_switch matrox_mystique = {
MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore, .preinit = MGA1064_preinit,
.reset = MGA1064_reset,
.init = MGA1064_init,
.restore = MGA1064_restore,
}; };
EXPORT_SYMBOL(matrox_mystique); EXPORT_SYMBOL(matrox_mystique);
#endif #endif
#ifdef CONFIG_FB_MATROX_G #ifdef CONFIG_FB_MATROX_G
struct matrox_switch matrox_G100 = { struct matrox_switch matrox_G100 = {
MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore, .preinit = MGAG100_preinit,
.reset = MGAG100_reset,
.init = MGAG100_init,
.restore = MGAG100_restore,
}; };
EXPORT_SYMBOL(matrox_G100); EXPORT_SYMBOL(matrox_G100);
#endif #endif
......
...@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo) ...@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
} }
struct matrox_switch matrox_millennium = { struct matrox_switch matrox_millennium = {
Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore .preinit = Ti3026_preinit,
.reset = Ti3026_reset,
.init = Ti3026_init,
.restore = Ti3026_restore
}; };
EXPORT_SYMBOL(matrox_millennium); EXPORT_SYMBOL(matrox_millennium);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment