Commit 1aa7ceab authored by Wang Hai's avatar Wang Hai Committed by Zheng Zengkai
Browse files

kabi: net: reserve space for net can subsystem related structure 

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I4HE7P?from=project-issue


CVE: NA

--------

Reserve some fields beforehand for net can framework related structures prone
to change.

---------

Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
Reviewed-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent f13098db

include/linux/can/core.h

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/can.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <linux/kabi.h>



#define DNAME(dev) ((dev) ? (dev)->name : "any")
@@ -32,6 +33,9 @@ struct can_proto { 
	int protocol;

	const struct proto_ops *ops;

	struct proto *prot;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



/* required_size

include/linux/can/dev.h

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/can/netlink.h>

#include <linux/can/skb.h>

#include <linux/netdevice.h>

#include <linux/kabi.h>



/*

 * CAN mode
@@ -80,6 +81,11 @@ struct can_priv { 
	struct led_trigger *rxtx_led_trig;

	char rxtx_led_trig_name[CAN_LED_NAME_SZ];

#endif



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



#define CAN_SYNC_SEG 1

include/linux/can/rx-offload.h

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <linux/netdevice.h>

#include <linux/can.h>

#include <linux/kabi.h>



struct can_rx_offload {

	struct net_device *dev;
@@ -28,6 +29,9 @@ struct can_rx_offload { 
	struct napi_struct napi;



	bool inc;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



int can_rx_offload_add_timestamp(struct net_device *dev,

include/linux/can/skb.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
struct can_skb_priv {

	int ifindex;

	int skbcnt;



	struct can_frame cf[];

};

include/net/netns/can.h

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#define __NETNS_CAN_H__



#include <linux/spinlock.h>

#include <linux/kabi.h>



struct can_dev_rcv_lists;

struct can_pkg_stats;
@@ -35,6 +36,8 @@ struct netns_can { 


	/* CAN GW per-net gateway jobs */

	struct hlist_head cgw_list;



	KABI_RESERVE(1)

};



#endif /* __NETNS_CAN_H__ */