* [PATCH v2 bpf-next] bpfilter: Fix mismatch in function argument types
@ 2018-07-19 7:56 YueHaibing
2018-07-19 15:48 ` Martin KaFai Lau
0 siblings, 1 reply; 4+ messages in thread
From: YueHaibing @ 2018-07-19 7:56 UTC (permalink / raw)
To: ast, daniel; +Cc: linux-kernel, netdev, YueHaibing
Fix following warning:
net/ipv4/bpfilter/sockopt.c:28:5: error: symbol 'bpfilter_ip_set_sockopt' redeclared with different type
net/ipv4/bpfilter/sockopt.c:34:5: error: symbol 'bpfilter_ip_get_sockopt' redeclared with different type
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
include/linux/bpfilter.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/linux/bpfilter.h b/include/linux/bpfilter.h
index 687b176..f02cee0 100644
--- a/include/linux/bpfilter.h
+++ b/include/linux/bpfilter.h
@@ -5,10 +5,10 @@
#include <uapi/linux/bpfilter.h>
struct sock;
-int bpfilter_ip_set_sockopt(struct sock *sk, int optname, char *optval,
+int bpfilter_ip_set_sockopt(struct sock *sk, int optname, char __user *optval,
unsigned int optlen);
-int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char *optval,
- int *optlen);
+int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char __user *optval,
+ int __user *optlen);
extern int (*bpfilter_process_sockopt)(struct sock *sk, int optname,
char __user *optval,
unsigned int optlen, bool is_set);
--
2.7.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 bpf-next] bpfilter: Fix mismatch in function argument types
2018-07-19 7:56 [PATCH v2 bpf-next] bpfilter: Fix mismatch in function argument types YueHaibing
@ 2018-07-19 15:48 ` Martin KaFai Lau
2018-07-19 15:51 ` Daniel Borkmann
0 siblings, 1 reply; 4+ messages in thread
From: Martin KaFai Lau @ 2018-07-19 15:48 UTC (permalink / raw)
To: YueHaibing; +Cc: ast, daniel, linux-kernel, netdev
On Thu, Jul 19, 2018 at 03:56:59PM +0800, YueHaibing wrote:
> Fix following warning:
> net/ipv4/bpfilter/sockopt.c:28:5: error: symbol 'bpfilter_ip_set_sockopt' redeclared with different type
> net/ipv4/bpfilter/sockopt.c:34:5: error: symbol 'bpfilter_ip_get_sockopt' redeclared with different type
>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
LGTM. Missing a Fixes tag though.
Fixes: d2ba09c17a06 ("net: add skeleton of bpfilter kernel module")
Acked-by: Martin KaFai Lau <kafai@fb.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2 bpf-next] bpfilter: Fix mismatch in function argument types
2018-07-19 15:48 ` Martin KaFai Lau
@ 2018-07-19 15:51 ` Daniel Borkmann
2018-07-21 23:21 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Borkmann @ 2018-07-19 15:51 UTC (permalink / raw)
To: Martin KaFai Lau, YueHaibing; +Cc: ast, linux-kernel, netdev
On 07/19/2018 05:48 PM, Martin KaFai Lau wrote:
> On Thu, Jul 19, 2018 at 03:56:59PM +0800, YueHaibing wrote:
>> Fix following warning:
>> net/ipv4/bpfilter/sockopt.c:28:5: error: symbol 'bpfilter_ip_set_sockopt' redeclared with different type
>> net/ipv4/bpfilter/sockopt.c:34:5: error: symbol 'bpfilter_ip_get_sockopt' redeclared with different type
>>
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> LGTM. Missing a Fixes tag though.
>
> Fixes: d2ba09c17a06 ("net: add skeleton of bpfilter kernel module")
> Acked-by: Martin KaFai Lau <kafai@fb.com>
(Should go to -net tree.)
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2 bpf-next] bpfilter: Fix mismatch in function argument types
2018-07-19 15:51 ` Daniel Borkmann
@ 2018-07-21 23:21 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2018-07-21 23:21 UTC (permalink / raw)
To: daniel; +Cc: kafai, yuehaibing, ast, linux-kernel, netdev
From: Daniel Borkmann <daniel@iogearbox.net>
Date: Thu, 19 Jul 2018 17:51:41 +0200
> On 07/19/2018 05:48 PM, Martin KaFai Lau wrote:
>> On Thu, Jul 19, 2018 at 03:56:59PM +0800, YueHaibing wrote:
>>> Fix following warning:
>>> net/ipv4/bpfilter/sockopt.c:28:5: error: symbol 'bpfilter_ip_set_sockopt' redeclared with different type
>>> net/ipv4/bpfilter/sockopt.c:34:5: error: symbol 'bpfilter_ip_get_sockopt' redeclared with different type
>>>
>>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> LGTM. Missing a Fixes tag though.
>>
>> Fixes: d2ba09c17a06 ("net: add skeleton of bpfilter kernel module")
>> Acked-by: Martin KaFai Lau <kafai@fb.com>
>
> (Should go to -net tree.)
>
> Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-07-21 23:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-19 7:56 [PATCH v2 bpf-next] bpfilter: Fix mismatch in function argument types YueHaibing
2018-07-19 15:48 ` Martin KaFai Lau
2018-07-19 15:51 ` Daniel Borkmann
2018-07-21 23:21 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox