2013-03-28 21:32:32

by Alexandru Copot

Subject: [PATCH net-next] audit: pass int* to nlmsg_next

Commit 941912133025926307c7a65b203fa38403b1063a replaced the macros
NLMSG_NEXT with calls to nlmsg_next which produces this warning:

kernel/audit.c: In function ‘audit_receive_skb’:
kernel/audit.c:928:3: warning: passing argument 2 of ‘nlmsg_next’ makes pointer from integer without a cast
In file included from include/net/rtnetlink.h:5:0,
from include/net/neighbour.h:28,
from include/net/dst.h:17,
from include/net/sock.h:68,
from kernel/audit.c:55:
include/net/netlink.h:359:1: note: expected ‘int *’ but argument is of type ‘int’

Fix this by sending the intended pointer.

Signed-off-by: Alexandru Copot <[email protected]>
---
kernel/audit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index 4dbb047..488f85f 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -925,7 +925,7 @@ static void audit_receive_skb(struct sk_buff *skb)
if (err || (nlh->nlmsg_flags & NLM_F_ACK))
netlink_ack(skb, nlh, err);

- nlh = nlmsg_next(nlh, len);
+ nlh = nlmsg_next(nlh, &len);
}
}

--
1.8.2

2013-03-28 21:40:47

by David Miller

Subject: Re: [PATCH net-next] audit: pass int* to nlmsg_next

From: Alexandru Copot <[email protected]>
Date: Thu, 28 Mar 2013 23:31:29 +0200

> Commit 941912133025926307c7a65b203fa38403b1063a replaced the macros
> NLMSG_NEXT with calls to nlmsg_next which produces this warning:
>
> kernel/audit.c: In function ?audit_receive_skb?:
> kernel/audit.c:928:3: warning: passing argument 2 of ?nlmsg_next? makes pointer from integer without a cast
> In file included from include/net/rtnetlink.h:5:0,
> from include/net/neighbour.h:28,
> from include/net/dst.h:17,
> from include/net/sock.h:68,
> from kernel/audit.c:55:
> include/net/netlink.h:359:1: note: expected ?int *? but argument is of type ?int?
>
> Fix this by sending the intended pointer.
>
> Signed-off-by: Alexandru Copot <[email protected]>

Applied, thanks.
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m????????????I?

2013-03-29 14:55:31

by Sergei Shtylyov

Subject: Re: [PATCH net-next] audit: pass int* to nlmsg_next

Hello.

On 29-03-2013 1:31, Alexandru Copot wrote:

> Commit 941912133025926307c7a65b203fa38403b1063a

Please also specify the summary line of that commit in parens (or however
you like).
With that, you can add my:

Acked-by: Sergei Shtylyov <[email protected]>

> replaced the macros
> NLMSG_NEXT with calls to nlmsg_next which produces this warning:

> kernel/audit.c: In function ‘audit_receive_skb’:
> kernel/audit.c:928:3: warning: passing argument 2 of ‘nlmsg_next’ makes pointer from integer without a cast
> In file included from include/net/rtnetlink.h:5:0,
> from include/net/neighbour.h:28,
> from include/net/dst.h:17,
> from include/net/sock.h:68,
> from kernel/audit.c:55:
> include/net/netlink.h:359:1: note: expected ‘int *’ but argument is of type ‘int’

> Fix this by sending the intended pointer.

> Signed-off-by: Alexandru Copot <[email protected]>

WBR, Sergei