forked from pool/ipset
Jan Engelhardt
25a80326cc
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=17
107 lines
3.7 KiB
Diff
107 lines
3.7 KiB
Diff
From fbd99092352fb0fac406da55b2ca08ba414823d0 Mon Sep 17 00:00:00 2001
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: Wed, 21 Nov 2012 23:47:16 +0100
|
|
Subject: [PATCH] build: Linux 3.7 netlink fun
|
|
|
|
---
|
|
kernel/net/netfilter/ipset/ip_set_core.c | 20 ++++++++++----------
|
|
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
|
|
index 01af069..1a1f29c 100644
|
|
--- a/kernel/net/netfilter/ipset/ip_set_core.c
|
|
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
|
|
@@ -1105,7 +1105,7 @@ ip_set_dump_start(struct sk_buff *skb, struct netlink_callback *cb)
|
|
ip_set_id_t index = IPSET_INVALID_ID, max;
|
|
struct ip_set *set = NULL;
|
|
struct nlmsghdr *nlh = NULL;
|
|
- unsigned int flags = NETLINK_CB(cb->skb).pid ? NLM_F_MULTI : 0;
|
|
+ unsigned int flags = NETLINK_CB(cb->skb).portid ? NLM_F_MULTI : 0;
|
|
u32 dump_type, dump_flags;
|
|
int ret = 0;
|
|
|
|
@@ -1153,7 +1153,7 @@ dump_last:
|
|
pr_debug("reference set\n");
|
|
__ip_set_get(index);
|
|
}
|
|
- nlh = start_msg(skb, NETLINK_CB(cb->skb).pid,
|
|
+ nlh = start_msg(skb, NETLINK_CB(cb->skb).portid,
|
|
cb->nlh->nlmsg_seq, flags,
|
|
IPSET_CMD_LIST);
|
|
if (!nlh) {
|
|
@@ -1296,7 +1296,7 @@ call_ad(struct sock *ctnl, struct sk_buff *skb, struct ip_set *set,
|
|
skb2 = nlmsg_new(payload, GFP_KERNEL);
|
|
if (skb2 == NULL)
|
|
return -ENOMEM;
|
|
- rep = __nlmsg_put(skb2, NETLINK_CB(skb).pid,
|
|
+ rep = __nlmsg_put(skb2, NETLINK_CB(skb).portid,
|
|
nlh->nlmsg_seq, NLMSG_ERROR, payload, 0);
|
|
errmsg = nlmsg_data(rep);
|
|
errmsg->error = ret;
|
|
@@ -1311,7 +1311,7 @@ call_ad(struct sock *ctnl, struct sk_buff *skb, struct ip_set *set,
|
|
|
|
*errline = lineno;
|
|
|
|
- netlink_unicast(ctnl, skb2, NETLINK_CB(skb).pid, MSG_DONTWAIT);
|
|
+ netlink_unicast(ctnl, skb2, NETLINK_CB(skb).portid, MSG_DONTWAIT);
|
|
/* Signal netlink not to send its ACK/errmsg. */
|
|
return -EINTR;
|
|
}
|
|
@@ -1486,7 +1486,7 @@ ip_set_header(struct sock *ctnl, struct sk_buff *skb,
|
|
if (skb2 == NULL)
|
|
return -ENOMEM;
|
|
|
|
- nlh2 = start_msg(skb2, NETLINK_CB(skb).pid, nlh->nlmsg_seq, 0,
|
|
+ nlh2 = start_msg(skb2, NETLINK_CB(skb).portid, nlh->nlmsg_seq, 0,
|
|
IPSET_CMD_HEADER);
|
|
if (!nlh2)
|
|
goto nlmsg_failure;
|
|
@@ -1498,7 +1498,7 @@ ip_set_header(struct sock *ctnl, struct sk_buff *skb,
|
|
goto nla_put_failure;
|
|
nlmsg_end(skb2, nlh2);
|
|
|
|
- ret = netlink_unicast(ctnl, skb2, NETLINK_CB(skb).pid, MSG_DONTWAIT);
|
|
+ ret = netlink_unicast(ctnl, skb2, NETLINK_CB(skb).portid, MSG_DONTWAIT);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
@@ -1546,7 +1546,7 @@ ip_set_type(struct sock *ctnl, struct sk_buff *skb,
|
|
if (skb2 == NULL)
|
|
return -ENOMEM;
|
|
|
|
- nlh2 = start_msg(skb2, NETLINK_CB(skb).pid, nlh->nlmsg_seq, 0,
|
|
+ nlh2 = start_msg(skb2, NETLINK_CB(skb).portid, nlh->nlmsg_seq, 0,
|
|
IPSET_CMD_TYPE);
|
|
if (!nlh2)
|
|
goto nlmsg_failure;
|
|
@@ -1559,7 +1559,7 @@ ip_set_type(struct sock *ctnl, struct sk_buff *skb,
|
|
nlmsg_end(skb2, nlh2);
|
|
|
|
pr_debug("Send TYPE, nlmsg_len: %u\n", nlh2->nlmsg_len);
|
|
- ret = netlink_unicast(ctnl, skb2, NETLINK_CB(skb).pid, MSG_DONTWAIT);
|
|
+ ret = netlink_unicast(ctnl, skb2, NETLINK_CB(skb).portid, MSG_DONTWAIT);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
@@ -1595,7 +1595,7 @@ ip_set_protocol(struct sock *ctnl, struct sk_buff *skb,
|
|
if (skb2 == NULL)
|
|
return -ENOMEM;
|
|
|
|
- nlh2 = start_msg(skb2, NETLINK_CB(skb).pid, nlh->nlmsg_seq, 0,
|
|
+ nlh2 = start_msg(skb2, NETLINK_CB(skb).portid, nlh->nlmsg_seq, 0,
|
|
IPSET_CMD_PROTOCOL);
|
|
if (!nlh2)
|
|
goto nlmsg_failure;
|
|
@@ -1603,7 +1603,7 @@ ip_set_protocol(struct sock *ctnl, struct sk_buff *skb,
|
|
goto nla_put_failure;
|
|
nlmsg_end(skb2, nlh2);
|
|
|
|
- ret = netlink_unicast(ctnl, skb2, NETLINK_CB(skb).pid, MSG_DONTWAIT);
|
|
+ ret = netlink_unicast(ctnl, skb2, NETLINK_CB(skb).portid, MSG_DONTWAIT);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
--
|
|
1.7.10.4
|
|
|