[PATCH] trivial: net: filter: Fix typo in comment

[PATCH] trivial: net: filter: Fix typo in comment

[Tobias Klauser]

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 net/core/filter.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/filter.c b/net/core/filter.c
index 735fad8..243fb5d 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -1382,7 +1382,7 @@ static struct sk_filter *__sk_migrate_realloc(struct sk_filter *fp,
 	fp_new = sock_kmalloc(sk, len, GFP_KERNEL);
 	if (fp_new) {
 		*fp_new = *fp;
-		/* As we're kepping orig_prog in fp_new along,
+		/* As we're keeping orig_prog in fp_new along,
 		 * we need to make sure we're not evicting it
 		 * from the old fp.
 		 */
-- 
1.7.9.5

[PATCH] trivial: net: filter: Change kerneldoc parameter order

[Tobias Klauser]

Change the order of the parameters to sk_unattached_filter_create() in
the kerneldoc to reflect the order they appear in the actual function.

This fix is only cosmetic, in the generated doc they still appear in the
correct order without the fix.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 net/core/filter.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/filter.c b/net/core/filter.c
index 243fb5d..ed8d929 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -1524,8 +1524,8 @@ static struct sk_filter *__sk_prepare_filter(struct sk_filter *fp,
 
 /**
  *	sk_unattached_filter_create - create an unattached filter
- *	@fprog: the filter program
  *	@pfp: the unattached filter that is created
+ *	@fprog: the filter program
  *
  * Create a filter independent of any socket. We first run some
  * sanity checks on it to make sure it does not explode on us later.
-- 
1.7.9.5

[PATCH] net: filter: Use kcalloc/kmalloc_array to allocate arrays

[Tobias Klauser]

Use kcalloc/kmalloc_array to make it clear we're allocating arrays. No
integer overflow can actually happen here, since len/flen is guaranteed
to be less than BPF_MAXINSNS (4096). However, this changed makes sure
we're not going to get one if BPF_MAXINSNS were ever increased.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 net/core/filter.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/core/filter.c b/net/core/filter.c
index ed8d929..e44c1c4 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -844,7 +844,7 @@ int sk_convert_filter(struct sock_filter *prog, int len,
 		return -EINVAL;
 
 	if (new_prog) {
-		addrs = kzalloc(len * sizeof(*addrs), GFP_KERNEL);
+		addrs = kcalloc(len, sizeof(*addrs), GFP_KERNEL);
 		if (!addrs)
 			return -ENOMEM;
 	}
@@ -1101,7 +1101,7 @@ static int check_load_and_stores(struct sock_filter *filter, int flen)
 
 	BUILD_BUG_ON(BPF_MEMWORDS > 16);
 
-	masks = kmalloc(flen * sizeof(*masks), GFP_KERNEL);
+	masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
 	if (!masks)
 		return -ENOMEM;
 
-- 
1.7.9.5

Re: [PATCH] trivial: net: filter: Fix typo in comment

[Daniel Borkmann]

On 06/24/2014 03:33 PM, Tobias Klauser wrote:
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Acked-by: Daniel Borkmann <dborkman@redhat.com>

Re: [PATCH] trivial: net: filter: Change kerneldoc parameter order

[Daniel Borkmann]

On 06/24/2014 03:33 PM, Tobias Klauser wrote:
> Change the order of the parameters to sk_unattached_filter_create() in
> the kerneldoc to reflect the order they appear in the actual function.
>
> This fix is only cosmetic, in the generated doc they still appear in the
> correct order without the fix.
>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Acked-by: Daniel Borkmann <dborkman@redhat.com>

Re: [PATCH] net: filter: Use kcalloc/kmalloc_array to allocate arrays

[Daniel Borkmann]

On 06/24/2014 03:33 PM, Tobias Klauser wrote:
> Use kcalloc/kmalloc_array to make it clear we're allocating arrays. No
> integer overflow can actually happen here, since len/flen is guaranteed
> to be less than BPF_MAXINSNS (4096). However, this changed makes sure
> we're not going to get one if BPF_MAXINSNS were ever increased.
>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Acked-by: Daniel Borkmann <dborkman@redhat.com>

Re: [PATCH] trivial: net: filter: Fix typo in comment

[Alexei Starovoitov]

On Tue, Jun 24, 2014 at 6:33 AM, Tobias Klauser <tklauser@distanz.ch> wrote:
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Acked-by: Alexei Starovoitov <ast@plumgrid.com>

Re: [PATCH] trivial: net: filter: Change kerneldoc parameter order

[Alexei Starovoitov]

On Tue, Jun 24, 2014 at 6:33 AM, Tobias Klauser <tklauser@distanz.ch> wrote:
> Change the order of the parameters to sk_unattached_filter_create() in
> the kerneldoc to reflect the order they appear in the actual function.
>
> This fix is only cosmetic, in the generated doc they still appear in the
> correct order without the fix.
>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Acked-by: Alexei Starovoitov <ast@plumgrid.com>

Re: [PATCH] net: filter: Use kcalloc/kmalloc_array to allocate arrays

[Alexei Starovoitov]

On Tue, Jun 24, 2014 at 6:33 AM, Tobias Klauser <tklauser@distanz.ch> wrote:
> Use kcalloc/kmalloc_array to make it clear we're allocating arrays. No
> integer overflow can actually happen here, since len/flen is guaranteed
> to be less than BPF_MAXINSNS (4096). However, this changed makes sure
> we're not going to get one if BPF_MAXINSNS were ever increased.
>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

typo in the commit log '… this changeD…'
other than that:
Acked-by: Alexei Starovoitov <ast@plumgrid.com>

> ---
>  net/core/filter.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/core/filter.c b/net/core/filter.c
> index ed8d929..e44c1c4 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -844,7 +844,7 @@ int sk_convert_filter(struct sock_filter *prog, int len,
>                 return -EINVAL;
>
>         if (new_prog) {
> -               addrs = kzalloc(len * sizeof(*addrs), GFP_KERNEL);
> +               addrs = kcalloc(len, sizeof(*addrs), GFP_KERNEL);
>                 if (!addrs)
>                         return -ENOMEM;
>         }
> @@ -1101,7 +1101,7 @@ static int check_load_and_stores(struct sock_filter *filter, int flen)
>
>         BUILD_BUG_ON(BPF_MEMWORDS > 16);
>
> -       masks = kmalloc(flen * sizeof(*masks), GFP_KERNEL);
> +       masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
>         if (!masks)
>                 return -ENOMEM;
>
> --
> 1.7.9.5
>
>

Re: [PATCH] trivial: net: filter: Fix typo in comment

[David Miller]

From: Tobias Klauser <tklauser@distanz.ch>
Date: Tue, 24 Jun 2014 15:33:20 +0200

> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Applied.

Re: [PATCH] trivial: net: filter: Change kerneldoc parameter order

[David Miller]

From: Tobias Klauser <tklauser@distanz.ch>
Date: Tue, 24 Jun 2014 15:33:21 +0200

> Change the order of the parameters to sk_unattached_filter_create() in
> the kerneldoc to reflect the order they appear in the actual function.
> 
> This fix is only cosmetic, in the generated doc they still appear in the
> correct order without the fix.
> 
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Applied.

Re: [PATCH] net: filter: Use kcalloc/kmalloc_array to allocate arrays

[David Miller]

From: Tobias Klauser <tklauser@distanz.ch>
Date: Tue, 24 Jun 2014 15:33:22 +0200

> Use kcalloc/kmalloc_array to make it clear we're allocating arrays. No
> integer overflow can actually happen here, since len/flen is guaranteed
> to be less than BPF_MAXINSNS (4096). However, this changed makes sure
> we're not going to get one if BPF_MAXINSNS were ever increased.
> 
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>

Applied, thank you.