Re: [PATCH xtables-addons 2/2] xt_DHCPMAC: replaced skb_make_writable with skb_ensure_writable.

[Jeremy Sowden <jeremy@azazel.net>]

[-- Attachment #1: Type: text/plain, Size: 992 bytes --]

On 2019-08-11, at 20:42:17 +0200, Florian Westphal wrote:
> Jeremy Sowden <jeremy@azazel.net> wrote:
> > skb_make_writable was removed from the kernel in 5.2 and its callers
> > converted to use skb_ensure_writable.
> >
> > Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
> > ---
> >  extensions/xt_DHCPMAC.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/extensions/xt_DHCPMAC.c b/extensions/xt_DHCPMAC.c
> > index 47f9534f74c7..412f8984d326 100644
> > --- a/extensions/xt_DHCPMAC.c
> > +++ b/extensions/xt_DHCPMAC.c
> > @@ -96,7 +96,7 @@ dhcpmac_tg(struct sk_buff *skb, const struct
> xt_action_param *par)
> >  	struct udphdr udpbuf, *udph;
> >  	unsigned int i;
> >
> > -	if (!skb_make_writable(skb, 0))
> > +	if (!skb_ensure_writable(skb, 0))
> >  		return NF_DROP;
>
> You need to drop the "!".  The "0" argument is suspicious as well, i
> guess this needs to be "skb->len".

Whoops.  Not paying enough attention.  Will correct and resend.

Thanks,

J.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]