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

Commit 0be7fa92 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: Fix CTA_PROTO_NUM attribute size in ctnetlink 



CTA_PROTO_NUM is a u_int8_t.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent afe5c6bb

net/ipv4/netfilter/ip_conntrack_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ ctnetlink_parse_tuple_ip(struct nfattr *attr, struct ip_conntrack_tuple *tuple) 
}



static const size_t cta_min_proto[CTA_PROTO_MAX] = {

	[CTA_PROTO_NUM-1]	= sizeof(u_int16_t),

	[CTA_PROTO_NUM-1]	= sizeof(u_int8_t),

	[CTA_PROTO_SRC_PORT-1]	= sizeof(u_int16_t),

	[CTA_PROTO_DST_PORT-1]	= sizeof(u_int16_t),

	[CTA_PROTO_ICMP_TYPE-1]	= sizeof(u_int8_t),
@@ -528,7 +528,7 @@ ctnetlink_parse_tuple_proto(struct nfattr *attr, 


	if (!tb[CTA_PROTO_NUM-1])

		return -EINVAL;

	tuple->dst.protonum = *(u_int16_t *)NFA_DATA(tb[CTA_PROTO_NUM-1]);

	tuple->dst.protonum = *(u_int8_t *)NFA_DATA(tb[CTA_PROTO_NUM-1]);



	proto = ip_conntrack_proto_find_get(tuple->dst.protonum);