浏览代码

[NETFILTER] conntrack_netlink: Fix endian issue with status from userspace

When we send "status" from userspace, we forget to convert the endianness.
This patch adds the reqired conversion.  Thanks to Pablo Neira for
discovering this.

Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Harald Welte 19 年之前
父节点
当前提交
d000eaf772
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      net/ipv4/netfilter/ip_conntrack_netlink.c

+ 2 - 1
net/ipv4/netfilter/ip_conntrack_netlink.c

@@ -833,7 +833,8 @@ out:
 static inline int
 static inline int
 ctnetlink_change_status(struct ip_conntrack *ct, struct nfattr *cda[])
 ctnetlink_change_status(struct ip_conntrack *ct, struct nfattr *cda[])
 {
 {
-	unsigned long d, status = *(u_int32_t *)NFA_DATA(cda[CTA_STATUS-1]);
+	unsigned long d;
+	unsigned status = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_STATUS-1]));
 	d = ct->status ^ status;
 	d = ct->status ^ status;
 
 
 	if (d & (IPS_EXPECTED|IPS_CONFIRMED|IPS_DYING))
 	if (d & (IPS_EXPECTED|IPS_CONFIRMED|IPS_DYING))