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

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

ATM: 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 47941950

net/atm/lec.c

+3 −3
Original line number Diff line number Diff line
@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry) 
}



static struct lane2_ops lane2_ops = {

	lane2_resolve,		/* resolve,             spec 3.1.3 */

	lane2_associate_req,	/* associate_req,       spec 3.1.4 */

	NULL			/* associate indicator, spec 3.1.5 */

	.resolve = lane2_resolve,		/* spec 3.1.3 */

	.associate_req = lane2_associate_req,	/* spec 3.1.4 */

	.associate_indicator = NULL             /* spec 3.1.5 */

};



static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

net/atm/mpoa_caches.c

+21 −22
Original line number Diff line number Diff line
@@ -535,33 +535,32 @@ static void eg_destroy_cache(struct mpoa_client *mpc) 




static const struct in_cache_ops ingress_ops = {

	in_cache_add_entry,               /* add_entry       */

	in_cache_get,                     /* get             */

	in_cache_get_with_mask,           /* get_with_mask   */

	in_cache_get_by_vcc,              /* get_by_vcc      */

	in_cache_put,                     /* put             */

	in_cache_remove_entry,            /* remove_entry    */

	cache_hit,                        /* cache_hit       */

	clear_count_and_expired,          /* clear_count     */

	check_resolving_entries,          /* check_resolving */

	refresh_entries,                  /* refresh         */

	in_destroy_cache                  /* destroy_cache   */

	.add_entry = in_cache_add_entry,

	.get = in_cache_get,

	.get_with_mask = in_cache_get_with_mask,

	.get_by_vcc = in_cache_get_by_vcc,

	.put = in_cache_put,

	.remove_entry = in_cache_remove_entry,

	.cache_hit = cache_hit,

	.clear_count = clear_count_and_expired,

	.check_resolving = check_resolving_entries,

	.refresh = refresh_entries,

	.destroy_cache = in_destroy_cache

};



static const struct eg_cache_ops egress_ops = {

	eg_cache_add_entry,               /* add_entry        */

	eg_cache_get_by_cache_id,         /* get_by_cache_id  */

	eg_cache_get_by_tag,              /* get_by_tag       */

	eg_cache_get_by_vcc,              /* get_by_vcc       */

	eg_cache_get_by_src_ip,           /* get_by_src_ip    */

	eg_cache_put,                     /* put              */

	eg_cache_remove_entry,            /* remove_entry     */

	update_eg_cache_entry,            /* update           */

	clear_expired,                    /* clear_expired    */

	eg_destroy_cache                  /* destroy_cache    */

	.add_entry = eg_cache_add_entry,

	.get_by_cache_id = eg_cache_get_by_cache_id,

	.get_by_tag = eg_cache_get_by_tag,

	.get_by_vcc = eg_cache_get_by_vcc,

	.get_by_src_ip = eg_cache_get_by_src_ip,

	.put = eg_cache_put,

	.remove_entry = eg_cache_remove_entry,

	.update = update_eg_cache_entry,

	.clear_expired = clear_expired,

	.destroy_cache = eg_destroy_cache

};





void atm_mpoa_init_cache(struct mpoa_client *mpc)

{

	mpc->in_ops = &ingress_ops;

net/vmw_vsock/vmci_transport_notify.c

+15 −15
Original line number Diff line number Diff line
@@ -662,19 +662,19 @@ static void vmci_transport_notify_pkt_process_negotiate(struct sock *sk) 


/* Socket control packet based operations. */

const struct vmci_transport_notify_ops vmci_transport_notify_pkt_ops = {

	vmci_transport_notify_pkt_socket_init,

	vmci_transport_notify_pkt_socket_destruct,

	vmci_transport_notify_pkt_poll_in,

	vmci_transport_notify_pkt_poll_out,

	vmci_transport_notify_pkt_handle_pkt,

	vmci_transport_notify_pkt_recv_init,

	vmci_transport_notify_pkt_recv_pre_block,

	vmci_transport_notify_pkt_recv_pre_dequeue,

	vmci_transport_notify_pkt_recv_post_dequeue,

	vmci_transport_notify_pkt_send_init,

	vmci_transport_notify_pkt_send_pre_block,

	vmci_transport_notify_pkt_send_pre_enqueue,

	vmci_transport_notify_pkt_send_post_enqueue,

	vmci_transport_notify_pkt_process_request,

	vmci_transport_notify_pkt_process_negotiate,

	.socket_init = vmci_transport_notify_pkt_socket_init,

	.socket_destruct = vmci_transport_notify_pkt_socket_destruct,

	.poll_in = vmci_transport_notify_pkt_poll_in,

	.poll_out = vmci_transport_notify_pkt_poll_out,

	.handle_notify_pkt = vmci_transport_notify_pkt_handle_pkt,

	.recv_init = vmci_transport_notify_pkt_recv_init,

	.recv_pre_block = vmci_transport_notify_pkt_recv_pre_block,

	.recv_pre_dequeue = vmci_transport_notify_pkt_recv_pre_dequeue,

	.recv_post_dequeue = vmci_transport_notify_pkt_recv_post_dequeue,

	.send_init = vmci_transport_notify_pkt_send_init,

	.send_pre_block = vmci_transport_notify_pkt_send_pre_block,

	.send_pre_enqueue = vmci_transport_notify_pkt_send_pre_enqueue,

	.send_post_enqueue = vmci_transport_notify_pkt_send_post_enqueue,

	.process_request = vmci_transport_notify_pkt_process_request,

	.process_negotiate = vmci_transport_notify_pkt_process_negotiate,

};

net/vmw_vsock/vmci_transport_notify_qstate.c

+15 −15
Original line number Diff line number Diff line
@@ -420,19 +420,19 @@ vmci_transport_notify_pkt_send_pre_enqueue( 


/* Socket always on control packet based operations. */

const struct vmci_transport_notify_ops vmci_transport_notify_pkt_q_state_ops = {

	vmci_transport_notify_pkt_socket_init,

	vmci_transport_notify_pkt_socket_destruct,

	vmci_transport_notify_pkt_poll_in,

	vmci_transport_notify_pkt_poll_out,

	vmci_transport_notify_pkt_handle_pkt,

	vmci_transport_notify_pkt_recv_init,

	vmci_transport_notify_pkt_recv_pre_block,

	vmci_transport_notify_pkt_recv_pre_dequeue,

	vmci_transport_notify_pkt_recv_post_dequeue,

	vmci_transport_notify_pkt_send_init,

	vmci_transport_notify_pkt_send_pre_block,

	vmci_transport_notify_pkt_send_pre_enqueue,

	vmci_transport_notify_pkt_send_post_enqueue,

	vmci_transport_notify_pkt_process_request,

	vmci_transport_notify_pkt_process_negotiate,

	.socket_init = vmci_transport_notify_pkt_socket_init,

	.socket_destruct = vmci_transport_notify_pkt_socket_destruct,

	.poll_in = vmci_transport_notify_pkt_poll_in,

	.poll_out = vmci_transport_notify_pkt_poll_out,

	.handle_notify_pkt = vmci_transport_notify_pkt_handle_pkt,

	.recv_init = vmci_transport_notify_pkt_recv_init,

	.recv_pre_block = vmci_transport_notify_pkt_recv_pre_block,

	.recv_pre_dequeue = vmci_transport_notify_pkt_recv_pre_dequeue,

	.recv_post_dequeue = vmci_transport_notify_pkt_recv_post_dequeue,

	.send_init = vmci_transport_notify_pkt_send_init,

	.send_pre_block = vmci_transport_notify_pkt_send_pre_block,

	.send_pre_enqueue = vmci_transport_notify_pkt_send_pre_enqueue,

	.send_post_enqueue = vmci_transport_notify_pkt_send_post_enqueue,

	.process_request = vmci_transport_notify_pkt_process_request,

	.process_negotiate = vmci_transport_notify_pkt_process_negotiate,

};