Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47941950 authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

isdn/gigaset: 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 avatarDavid S. Miller <davem@davemloft.net>
parent cd333e37

drivers/isdn/gigaset/bas-gigaset.c

+16 −16
Original line number Diff line number Diff line
@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf) 




static const struct gigaset_ops gigops = {

	gigaset_write_cmd,

	gigaset_write_room,

	gigaset_chars_in_buffer,

	gigaset_brkchars,

	gigaset_init_bchannel,

	gigaset_close_bchannel,

	gigaset_initbcshw,

	gigaset_freebcshw,

	gigaset_reinitbcshw,

	gigaset_initcshw,

	gigaset_freecshw,

	gigaset_set_modem_ctrl,

	gigaset_baud_rate,

	gigaset_set_line_ctrl,

	gigaset_isoc_send_skb,

	gigaset_isoc_input,

	.write_cmd = gigaset_write_cmd,

	.write_room = gigaset_write_room,

	.chars_in_buffer = gigaset_chars_in_buffer,

	.brkchars = gigaset_brkchars,

	.init_bchannel = gigaset_init_bchannel,

	.close_bchannel = gigaset_close_bchannel,

	.initbcshw = gigaset_initbcshw,

	.freebcshw = gigaset_freebcshw,

	.reinitbcshw = gigaset_reinitbcshw,

	.initcshw = gigaset_initcshw,

	.freecshw = gigaset_freecshw,

	.set_modem_ctrl = gigaset_set_modem_ctrl,

	.baud_rate = gigaset_baud_rate,

	.set_line_ctrl = gigaset_set_line_ctrl,

	.send_skb = gigaset_isoc_send_skb,

	.handle_input = gigaset_isoc_input,

};



/* bas_gigaset_init

drivers/isdn/gigaset/ser-gigaset.c

+16 −16
Original line number Diff line number Diff line
@@ -445,22 +445,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag) 
}



static const struct gigaset_ops ops = {

	gigaset_write_cmd,

	gigaset_write_room,

	gigaset_chars_in_buffer,

	gigaset_brkchars,

	gigaset_init_bchannel,

	gigaset_close_bchannel,

	gigaset_initbcshw,

	gigaset_freebcshw,

	gigaset_reinitbcshw,

	gigaset_initcshw,

	gigaset_freecshw,

	gigaset_set_modem_ctrl,

	gigaset_baud_rate,

	gigaset_set_line_ctrl,

	gigaset_m10x_send_skb,	/* asyncdata.c */

	gigaset_m10x_input,	/* asyncdata.c */

	.write_cmd = gigaset_write_cmd,

	.write_room = gigaset_write_room,

	.chars_in_buffer = gigaset_chars_in_buffer,

	.brkchars = gigaset_brkchars,

	.init_bchannel = gigaset_init_bchannel,

	.close_bchannel = gigaset_close_bchannel,

	.initbcshw = gigaset_initbcshw,

	.freebcshw = gigaset_freebcshw,

	.reinitbcshw = gigaset_reinitbcshw,

	.initcshw = gigaset_initcshw,

	.freecshw = gigaset_freecshw,

	.set_modem_ctrl = gigaset_set_modem_ctrl,

	.baud_rate = gigaset_baud_rate,

	.set_line_ctrl = gigaset_set_line_ctrl,

	.send_skb = gigaset_m10x_send_skb,	/* asyncdata.c */

	.handle_input = gigaset_m10x_input,	/* asyncdata.c */

};

drivers/isdn/gigaset/usb-gigaset.c

+16 −16
Original line number Diff line number Diff line
@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf) 
}



static const struct gigaset_ops ops = {

	gigaset_write_cmd,

	gigaset_write_room,

	gigaset_chars_in_buffer,

	gigaset_brkchars,

	gigaset_init_bchannel,

	gigaset_close_bchannel,

	gigaset_initbcshw,

	gigaset_freebcshw,

	gigaset_reinitbcshw,

	gigaset_initcshw,

	gigaset_freecshw,

	gigaset_set_modem_ctrl,

	gigaset_baud_rate,

	gigaset_set_line_ctrl,

	gigaset_m10x_send_skb,

	gigaset_m10x_input,

	.write_cmd = gigaset_write_cmd,

	.write_room = gigaset_write_room,

	.chars_in_buffer = gigaset_chars_in_buffer,

	.brkchars = gigaset_brkchars,

	.init_bchannel = gigaset_init_bchannel,

	.close_bchannel = gigaset_close_bchannel,

	.initbcshw = gigaset_initbcshw,

	.freebcshw = gigaset_freebcshw,

	.reinitbcshw = gigaset_reinitbcshw,

	.initcshw = gigaset_initcshw,

	.freecshw = gigaset_freecshw,

	.set_modem_ctrl = gigaset_set_modem_ctrl,

	.baud_rate = gigaset_baud_rate,

	.set_line_ctrl = gigaset_set_line_ctrl,

	.send_skb = gigaset_m10x_send_skb,

	.handle_input = gigaset_m10x_input,

};



/*