netdev - Re: [PATCH 1/4] netfilter: Add nf_hook

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1428414081.3965860.250247565.2F639A0C@webmail.messagingengine.com>
Date:	Tue, 07 Apr 2015 15:41:21 +0200
From:	Hannes Frederic Sowa <hannes@...essinduktion.org>
To:	David Miller <davem@...emloft.net>, netdev@...r.kernel.org
Cc:	netfilter-devel@...r.kernel.org, pablo@...filter.org,
	jiri@...nulli.us
Subject: Re: [PATCH 1/4] netfilter: Add nf_hook_state initializer function.



On Mon, Apr 6, 2015, at 04:18, David Miller wrote:
> 
> This way we can consolidate where we setup new nf_hook_state objects,
> to make sure the entire thing is initialized.
> 
> The only other place an nf_hook_object is instantiated is nf_queue,
> wherein a structure copy is used.
> 
> Signed-off-by: David S. Miller <davem@...emloft.net>
> ---
>  include/linux/netfilter.h | 26 ++++++++++++++++++--------
>  1 file changed, 18 insertions(+), 8 deletions(-)
> 
> diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
> index c480c43..b8c88f3 100644
> --- a/include/linux/netfilter.h
> +++ b/include/linux/netfilter.h
> @@ -54,6 +54,21 @@ struct nf_hook_state {
>  	int (*okfn)(struct sk_buff *);
>  };
>  
> +static inline void nf_hook_state_init(struct nf_hook_state *p,
> +                                     unsigned int hook,
> +                                     int thresh, u_int8_t pf,
> +                                     struct net_device *indev,
> +                                     struct net_device *outdev,
> +                                     int (*okfn)(struct sk_buff *))
> +{
> +       p->hook = hook;
> +       p->thresh = thresh;
> +       p->pf = pf;
> +       p->in = indev;
> +       p->out = outdev;
> +       p->okfn = okfn;
> +}
> +

Minor suggestion:

I think we can return the structure as a whole:

static inline struct nf_hook_state nf_hook_state_init(unsigned int hook,
...).

Being static inline it should not make any difference.


>  typedef unsigned int nf_hookfn(const struct nf_hook_ops *ops,
>  			       struct sk_buff *skb,
>  			       const struct nf_hook_state *state);
> @@ -142,15 +157,10 @@ static inline int nf_hook_thresh(u_int8_t pf,
> unsigned int hook,
>  				 int (*okfn)(struct sk_buff *), int thresh)
>  {
>  	if (nf_hooks_active(pf, hook)) {
> -               struct nf_hook_state state = {
> -                       .hook = hook,
> -                       .thresh = thresh,
> -                       .pf = pf,
> -                       .in = indev,
> -                       .out = outdev,
> -                       .okfn = okfn
> -               };
> +               struct nf_hook_state state;
>  
> +               nf_hook_state_init(&state, hook, thresh, pf,
> +                                  indev, outdev, okfn);

state = nf_hook_state_init(hook, thresh, pf, indev, outdev, okfn);

>  		return nf_hook_slow(skb, &state);
>  	}
>  	return 1;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html