* [PATCH 2/5 v4] nfc: Fix portid type in urelease_work
2015-04-12 22:52 [PATCH 1/5 v4] netlink: Fix portid type in netlink_notify Richard Weinberger
@ 2015-04-12 22:52 ` Richard Weinberger
2015-04-13 20:35 ` David Miller
2015-04-12 22:52 ` [PATCH 3/5 v4] netfilter: Fix portid types Richard Weinberger
` (3 subsequent siblings)
4 siblings, 1 reply; 15+ messages in thread
From: Richard Weinberger @ 2015-04-12 22:52 UTC (permalink / raw)
To: netdev
Cc: linux-wireless, coreteam, netfilter-devel, linux-kernel, sameo,
aloisio.almeida, lauro.venancio, davem, kadlec, kaber, pablo,
Richard Weinberger
portid is an unsigned integer. Fix urelease_work to
match all other portid user in the kernel.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
net/nfc/netlink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 14a2d11..3763036 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -1584,7 +1584,7 @@ static const struct genl_ops nfc_genl_ops[] = {
struct urelease_work {
struct work_struct w;
- int portid;
+ u32 portid;
};
static void nfc_urelease_event_work(struct work_struct *work)
--
1.8.4.5
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 2/5 v4] nfc: Fix portid type in urelease_work
@ 2015-04-13 20:35 ` David Miller
0 siblings, 0 replies; 15+ messages in thread
From: David Miller @ 2015-04-13 20:35 UTC (permalink / raw)
To: richard
Cc: netdev, linux-wireless, coreteam, netfilter-devel, linux-kernel,
sameo, aloisio.almeida, lauro.venancio, kadlec, kaber, pablo
From: Richard Weinberger <richard@nod.at>
Date: Mon, 13 Apr 2015 00:52:36 +0200
> portid is an unsigned integer. Fix urelease_work to
> match all other portid user in the kernel.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
Applied.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/5 v4] nfc: Fix portid type in urelease_work
@ 2015-04-13 20:35 ` David Miller
0 siblings, 0 replies; 15+ messages in thread
From: David Miller @ 2015-04-13 20:35 UTC (permalink / raw)
To: richard-/L3Ra7n9ekc
Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
coreteam-Cap9r6Oaw4JrovVCs/uTlw,
netfilter-devel-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
sameo-VuQAYsv1563Yd54FQh9/CA,
aloisio.almeida-430g2QfJUUCGglJvpFV4uA,
lauro.venancio-430g2QfJUUCGglJvpFV4uA,
kadlec-K40Dz/62t/MgiyqX0sVFJYdd74u8MsAO,
kaber-dcUjhNyLwpNeoWH0uzbU5w, pablo-Cap9r6Oaw4JrovVCs/uTlw
From: Richard Weinberger <richard-/L3Ra7n9ekc@public.gmane.org>
Date: Mon, 13 Apr 2015 00:52:36 +0200
> portid is an unsigned integer. Fix urelease_work to
> match all other portid user in the kernel.
>
> Signed-off-by: Richard Weinberger <richard-/L3Ra7n9ekc@public.gmane.org>
Applied.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 3/5 v4] netfilter: Fix portid types
2015-04-12 22:52 [PATCH 1/5 v4] netlink: Fix portid type in netlink_notify Richard Weinberger
2015-04-12 22:52 ` [PATCH 2/5 v4] nfc: Fix portid type in urelease_work Richard Weinberger
@ 2015-04-12 22:52 ` Richard Weinberger
2015-04-13 18:43 ` Pablo Neira Ayuso
2015-04-13 20:35 ` David Miller
2015-04-12 22:52 ` [PATCH 4/5 v4] netfilter: Fix format string of nfnetlink_queue proc file Richard Weinberger
` (2 subsequent siblings)
4 siblings, 2 replies; 15+ messages in thread
From: Richard Weinberger @ 2015-04-12 22:52 UTC (permalink / raw)
To: netdev
Cc: linux-wireless, coreteam, netfilter-devel, linux-kernel, sameo,
aloisio.almeida, lauro.venancio, davem, kadlec, kaber, pablo,
Richard Weinberger
The netlink portid is an unsigned integer, use this type
also in netfilter.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
net/netfilter/nfnetlink_log.c | 4 ++--
net/netfilter/nfnetlink_queue_core.c | 7 +++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 51afea4..5c79735 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -63,7 +63,7 @@ struct nfulnl_instance {
struct timer_list timer;
struct net *net;
struct user_namespace *peer_user_ns; /* User namespace of the peer process */
- int peer_portid; /* PORTID of the peer process */
+ u32 peer_portid; /* PORTID of the peer process */
/* configurable parameters */
unsigned int flushtimeout; /* timeout until queue flush */
@@ -152,7 +152,7 @@ static void nfulnl_timer(unsigned long data);
static struct nfulnl_instance *
instance_create(struct net *net, u_int16_t group_num,
- int portid, struct user_namespace *user_ns)
+ u32 portid, struct user_namespace *user_ns)
{
struct nfulnl_instance *inst;
struct nfnl_log_net *log = nfnl_log_pernet(net);
diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c
index 628afc3..49267f8 100644
--- a/net/netfilter/nfnetlink_queue_core.c
+++ b/net/netfilter/nfnetlink_queue_core.c
@@ -55,7 +55,7 @@ struct nfqnl_instance {
struct hlist_node hlist; /* global list of queues */
struct rcu_head rcu;
- int peer_portid;
+ u32 peer_portid;
unsigned int queue_maxlen;
unsigned int copy_range;
unsigned int queue_dropped;
@@ -110,8 +110,7 @@ instance_lookup(struct nfnl_queue_net *q, u_int16_t queue_num)
}
static struct nfqnl_instance *
-instance_create(struct nfnl_queue_net *q, u_int16_t queue_num,
- int portid)
+instance_create(struct nfnl_queue_net *q, u_int16_t queue_num, u32 portid)
{
struct nfqnl_instance *inst;
unsigned int h;
@@ -870,7 +869,7 @@ static const struct nla_policy nfqa_verdict_batch_policy[NFQA_MAX+1] = {
};
static struct nfqnl_instance *
-verdict_instance_lookup(struct nfnl_queue_net *q, u16 queue_num, int nlportid)
+verdict_instance_lookup(struct nfnl_queue_net *q, u16 queue_num, u32 nlportid)
{
struct nfqnl_instance *queue;
--
1.8.4.5
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 3/5 v4] netfilter: Fix portid types
2015-04-12 22:52 ` [PATCH 3/5 v4] netfilter: Fix portid types Richard Weinberger
@ 2015-04-13 18:43 ` Pablo Neira Ayuso
2015-04-13 20:35 ` David Miller
1 sibling, 0 replies; 15+ messages in thread
From: Pablo Neira Ayuso @ 2015-04-13 18:43 UTC (permalink / raw)
To: Richard Weinberger
Cc: netdev, linux-wireless, coreteam, netfilter-devel, linux-kernel,
sameo, aloisio.almeida, lauro.venancio, davem, kadlec, kaber
On Mon, Apr 13, 2015 at 12:52:37AM +0200, Richard Weinberger wrote:
> The netlink portid is an unsigned integer, use this type
> also in netfilter.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/5 v4] netfilter: Fix portid types
2015-04-12 22:52 ` [PATCH 3/5 v4] netfilter: Fix portid types Richard Weinberger
2015-04-13 18:43 ` Pablo Neira Ayuso
@ 2015-04-13 20:35 ` David Miller
1 sibling, 0 replies; 15+ messages in thread
From: David Miller @ 2015-04-13 20:35 UTC (permalink / raw)
To: richard
Cc: netdev, linux-wireless, coreteam, netfilter-devel, linux-kernel,
sameo, aloisio.almeida, lauro.venancio, kadlec, kaber, pablo
From: Richard Weinberger <richard@nod.at>
Date: Mon, 13 Apr 2015 00:52:37 +0200
> The netlink portid is an unsigned integer, use this type
> also in netfilter.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
Applied.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 4/5 v4] netfilter: Fix format string of nfnetlink_queue proc file
2015-04-12 22:52 [PATCH 1/5 v4] netlink: Fix portid type in netlink_notify Richard Weinberger
2015-04-12 22:52 ` [PATCH 2/5 v4] nfc: Fix portid type in urelease_work Richard Weinberger
2015-04-12 22:52 ` [PATCH 3/5 v4] netfilter: Fix portid types Richard Weinberger
@ 2015-04-12 22:52 ` Richard Weinberger
2015-04-13 18:43 ` Pablo Neira Ayuso
2015-04-13 20:35 ` David Miller
2015-04-12 22:52 ` [PATCH 5/5 v4] netfilter: Fix format string of nfnetlink_log " Richard Weinberger
2015-04-13 20:35 ` [PATCH 1/5 v4] netlink: Fix portid type in netlink_notify David Miller
4 siblings, 2 replies; 15+ messages in thread
From: Richard Weinberger @ 2015-04-12 22:52 UTC (permalink / raw)
To: netdev
Cc: linux-wireless, coreteam, netfilter-devel, linux-kernel, sameo,
aloisio.almeida, lauro.venancio, davem, kadlec, kaber, pablo,
Richard Weinberger
The printed values are all of type unsigned integer, therefore use
%u instead of %d. Otherwise an user can face negative values.
Fixes:
$ cat /proc/net/netfilter/nfnetlink_queue
0 29508 278 2 65531 0 2004213241 -2129885586 1
1 -27747 0 2 65531 0 0 0 1
2 -27748 0 2 65531 0 0 0 1
Signed-off-by: Richard Weinberger <richard@nod.at>
---
net/netfilter/nfnetlink_queue_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c
index 49267f8..0b98c74 100644
--- a/net/netfilter/nfnetlink_queue_core.c
+++ b/net/netfilter/nfnetlink_queue_core.c
@@ -1251,7 +1251,7 @@ static int seq_show(struct seq_file *s, void *v)
{
const struct nfqnl_instance *inst = v;
- seq_printf(s, "%5d %6d %5d %1d %5d %5d %5d %8d %2d\n",
+ seq_printf(s, "%5u %6u %5u %1u %5u %5u %5u %8u %2d\n",
inst->queue_num,
inst->peer_portid, inst->queue_total,
inst->copy_mode, inst->copy_range,
--
1.8.4.5
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 4/5 v4] netfilter: Fix format string of nfnetlink_queue proc file
2015-04-12 22:52 ` [PATCH 4/5 v4] netfilter: Fix format string of nfnetlink_queue proc file Richard Weinberger
@ 2015-04-13 18:43 ` Pablo Neira Ayuso
2015-04-13 20:35 ` David Miller
1 sibling, 0 replies; 15+ messages in thread
From: Pablo Neira Ayuso @ 2015-04-13 18:43 UTC (permalink / raw)
To: Richard Weinberger
Cc: netdev, linux-wireless, coreteam, netfilter-devel, linux-kernel,
sameo, aloisio.almeida, lauro.venancio, davem, kadlec, kaber
On Mon, Apr 13, 2015 at 12:52:38AM +0200, Richard Weinberger wrote:
> The printed values are all of type unsigned integer, therefore use
> %u instead of %d. Otherwise an user can face negative values.
>
> Fixes:
> $ cat /proc/net/netfilter/nfnetlink_queue
> 0 29508 278 2 65531 0 2004213241 -2129885586 1
> 1 -27747 0 2 65531 0 0 0 1
> 2 -27748 0 2 65531 0 0 0 1
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 4/5 v4] netfilter: Fix format string of nfnetlink_queue proc file
2015-04-12 22:52 ` [PATCH 4/5 v4] netfilter: Fix format string of nfnetlink_queue proc file Richard Weinberger
2015-04-13 18:43 ` Pablo Neira Ayuso
@ 2015-04-13 20:35 ` David Miller
1 sibling, 0 replies; 15+ messages in thread
From: David Miller @ 2015-04-13 20:35 UTC (permalink / raw)
To: richard
Cc: netdev, linux-wireless, coreteam, netfilter-devel, linux-kernel,
sameo, aloisio.almeida, lauro.venancio, kadlec, kaber, pablo
From: Richard Weinberger <richard@nod.at>
Date: Mon, 13 Apr 2015 00:52:38 +0200
> The printed values are all of type unsigned integer, therefore use
> %u instead of %d. Otherwise an user can face negative values.
>
> Fixes:
> $ cat /proc/net/netfilter/nfnetlink_queue
> 0 29508 278 2 65531 0 2004213241 -2129885586 1
> 1 -27747 0 2 65531 0 0 0 1
> 2 -27748 0 2 65531 0 0 0 1
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
Applied.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 5/5 v4] netfilter: Fix format string of nfnetlink_log proc file
2015-04-12 22:52 [PATCH 1/5 v4] netlink: Fix portid type in netlink_notify Richard Weinberger
` (2 preceding siblings ...)
2015-04-12 22:52 ` [PATCH 4/5 v4] netfilter: Fix format string of nfnetlink_queue proc file Richard Weinberger
@ 2015-04-12 22:52 ` Richard Weinberger
2015-04-13 18:43 ` Pablo Neira Ayuso
2015-04-13 20:35 ` David Miller
2015-04-13 20:35 ` [PATCH 1/5 v4] netlink: Fix portid type in netlink_notify David Miller
4 siblings, 2 replies; 15+ messages in thread
From: Richard Weinberger @ 2015-04-12 22:52 UTC (permalink / raw)
To: netdev
Cc: linux-wireless, coreteam, netfilter-devel, linux-kernel, sameo,
aloisio.almeida, lauro.venancio, davem, kadlec, kaber, pablo,
Richard Weinberger
The printed values are all of type unsigned integer, therefore use
%u instead of %d. Otherwise an user can face negative values.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
net/netfilter/nfnetlink_log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 5c79735..3ad9126 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -1007,7 +1007,7 @@ static int seq_show(struct seq_file *s, void *v)
{
const struct nfulnl_instance *inst = v;
- seq_printf(s, "%5d %6d %5d %1d %5d %6d %2d\n",
+ seq_printf(s, "%5u %6u %5u %1u %5u %6u %2u\n",
inst->group_num,
inst->peer_portid, inst->qlen,
inst->copy_mode, inst->copy_range,
--
1.8.4.5
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 5/5 v4] netfilter: Fix format string of nfnetlink_log proc file
@ 2015-04-13 18:43 ` Pablo Neira Ayuso
0 siblings, 0 replies; 15+ messages in thread
From: Pablo Neira Ayuso @ 2015-04-13 18:43 UTC (permalink / raw)
To: Richard Weinberger
Cc: netdev, linux-wireless, coreteam, netfilter-devel, linux-kernel,
sameo, aloisio.almeida, lauro.venancio, davem, kadlec, kaber
On Mon, Apr 13, 2015 at 12:52:39AM +0200, Richard Weinberger wrote:
> The printed values are all of type unsigned integer, therefore use
> %u instead of %d. Otherwise an user can face negative values.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 5/5 v4] netfilter: Fix format string of nfnetlink_log proc file
@ 2015-04-13 18:43 ` Pablo Neira Ayuso
0 siblings, 0 replies; 15+ messages in thread
From: Pablo Neira Ayuso @ 2015-04-13 18:43 UTC (permalink / raw)
To: Richard Weinberger
Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
coreteam-Cap9r6Oaw4JrovVCs/uTlw,
netfilter-devel-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
sameo-VuQAYsv1563Yd54FQh9/CA,
aloisio.almeida-430g2QfJUUCGglJvpFV4uA,
lauro.venancio-430g2QfJUUCGglJvpFV4uA,
davem-fT/PcQaiUtIeIZ0/mPfg9Q,
kadlec-K40Dz/62t/MgiyqX0sVFJYdd74u8MsAO,
kaber-dcUjhNyLwpNeoWH0uzbU5w
On Mon, Apr 13, 2015 at 12:52:39AM +0200, Richard Weinberger wrote:
> The printed values are all of type unsigned integer, therefore use
> %u instead of %d. Otherwise an user can face negative values.
>
> Signed-off-by: Richard Weinberger <richard-/L3Ra7n9ekc@public.gmane.org>
Acked-by: Pablo Neira Ayuso <pablo-Cap9r6Oaw4JrovVCs/uTlw@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 5/5 v4] netfilter: Fix format string of nfnetlink_log proc file
2015-04-12 22:52 ` [PATCH 5/5 v4] netfilter: Fix format string of nfnetlink_log " Richard Weinberger
2015-04-13 18:43 ` Pablo Neira Ayuso
@ 2015-04-13 20:35 ` David Miller
1 sibling, 0 replies; 15+ messages in thread
From: David Miller @ 2015-04-13 20:35 UTC (permalink / raw)
To: richard
Cc: netdev, linux-wireless, coreteam, netfilter-devel, linux-kernel,
sameo, aloisio.almeida, lauro.venancio, kadlec, kaber, pablo
From: Richard Weinberger <richard@nod.at>
Date: Mon, 13 Apr 2015 00:52:39 +0200
> The printed values are all of type unsigned integer, therefore use
> %u instead of %d. Otherwise an user can face negative values.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
Applied.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/5 v4] netlink: Fix portid type in netlink_notify
2015-04-12 22:52 [PATCH 1/5 v4] netlink: Fix portid type in netlink_notify Richard Weinberger
` (3 preceding siblings ...)
2015-04-12 22:52 ` [PATCH 5/5 v4] netfilter: Fix format string of nfnetlink_log " Richard Weinberger
@ 2015-04-13 20:35 ` David Miller
4 siblings, 0 replies; 15+ messages in thread
From: David Miller @ 2015-04-13 20:35 UTC (permalink / raw)
To: richard
Cc: netdev, linux-wireless, coreteam, netfilter-devel, linux-kernel,
sameo, aloisio.almeida, lauro.venancio, kadlec, kaber, pablo
From: Richard Weinberger <richard@nod.at>
Date: Mon, 13 Apr 2015 00:52:35 +0200
> portid is an unsigned integer. Fix netlink_notify to
> match all other portid user in the kernel.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
Applied.
^ permalink raw reply [flat|nested] 15+ messages in thread