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

Commit 8a47077a authored Jun 28, 2005 by Patrick McHardy Committed by David S. Miller Jun 28, 2005

[NETLINK]: Missing padding fields in dumped structures



Plug holes with padding fields and initialized them to zero.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9ef1d4c7

include/linux/pkt_cls.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -276,6 +276,7 @@ struct tc_rsvp_pinfo
	__u8 protocol;		__u8 protocol;
	__u8 tunnelid;		__u8 tunnelid;
	__u8 tunnelhdr;		__u8 tunnelhdr;
			__u8 pad;
	};		};

	/* ROUTE filter */		/* ROUTE filter */

include/linux/pkt_sched.h

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -224,6 +224,8 @@ struct tc_gred_sopt
	__u32 DPs;		__u32 DPs;
	__u32 def_DP;		__u32 def_DP;
	__u8 grio;		__u8 grio;
			__u8 pad1;
			__u16 pad2;
	};		};

	/* HTB section */		/* HTB section */
	@@ -351,6 +353,7 @@ struct tc_cbq_ovl
	#define TC_CBQ_OVL_DROP 3		#define TC_CBQ_OVL_DROP 3
	#define TC_CBQ_OVL_RCLASSIC 4		#define TC_CBQ_OVL_RCLASSIC 4
	unsigned char priority2;		unsigned char priority2;
			__u16 pad;
	__u32 penalty;		__u32 penalty;
	};		};

include/linux/rtnetlink.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -363,6 +363,8 @@ enum
	struct rta_session		struct rta_session
	{		{
	__u8 proto;		__u8 proto;
			__u8 pad1;
			__u16 pad2;

	union {		union {
	struct {		struct {
	@@ -635,10 +637,13 @@ struct ifinfomsg
	struct prefixmsg		struct prefixmsg
	{		{
	unsigned char prefix_family;		unsigned char prefix_family;
			unsigned char prefix_pad1;
			unsigned short prefix_pad2;
	int prefix_ifindex;		int prefix_ifindex;
	unsigned char prefix_type;		unsigned char prefix_type;
	unsigned char prefix_len;		unsigned char prefix_len;
	unsigned char prefix_flags;		unsigned char prefix_flags;
			unsigned char prefix_pad3;
	};		};

	enum		enum

net/ipv6/addrconf.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3031,9 +3031,12 @@ static int inet6_fill_prefix(struct sk_buff skb, struct inet6_dev idev,
	nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*pmsg), flags);		nlh = NLMSG_NEW(skb, pid, seq, event, sizeof(*pmsg), flags);
	pmsg = NLMSG_DATA(nlh);		pmsg = NLMSG_DATA(nlh);
	pmsg->prefix_family = AF_INET6;		pmsg->prefix_family = AF_INET6;
			pmsg->prefix_pad1 = 0;
			pmsg->prefix_pad2 = 0;
	pmsg->prefix_ifindex = idev->dev->ifindex;		pmsg->prefix_ifindex = idev->dev->ifindex;
	pmsg->prefix_len = pinfo->prefix_len;		pmsg->prefix_len = pinfo->prefix_len;
	pmsg->prefix_type = pinfo->type;		pmsg->prefix_type = pinfo->type;
			pmsg->prefix_pad3 = 0;

	pmsg->prefix_flags = 0;		pmsg->prefix_flags = 0;
	if (pinfo->onlink)		if (pinfo->onlink)

net/sched/cls_rsvp.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -618,6 +618,7 @@ static int rsvp_dump(struct tcf_proto *tp, unsigned long fh,
	pinfo.protocol = s->protocol;		pinfo.protocol = s->protocol;
	pinfo.tunnelid = s->tunnelid;		pinfo.tunnelid = s->tunnelid;
	pinfo.tunnelhdr = f->tunnelhdr;		pinfo.tunnelhdr = f->tunnelhdr;
			pinfo.pad = 0;
	RTA_PUT(skb, TCA_RSVP_PINFO, sizeof(pinfo), &pinfo);		RTA_PUT(skb, TCA_RSVP_PINFO, sizeof(pinfo), &pinfo);
	if (f->res.classid)		if (f->res.classid)
	RTA_PUT(skb, TCA_RSVP_CLASSID, 4, &f->res.classid);		RTA_PUT(skb, TCA_RSVP_CLASSID, 4, &f->res.classid);