From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5DB9C0650F for ; Sun, 11 Aug 2019 18:42:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A20392085A for ; Sun, 11 Aug 2019 18:42:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726137AbfHKSmU (ORCPT ); Sun, 11 Aug 2019 14:42:20 -0400 Received: from Chamillionaire.breakpoint.cc ([193.142.43.52]:42914 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725939AbfHKSmU (ORCPT ); Sun, 11 Aug 2019 14:42:20 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.89) (envelope-from ) id 1hwsnJ-0004m2-IM; Sun, 11 Aug 2019 20:42:17 +0200 Date: Sun, 11 Aug 2019 20:42:17 +0200 From: Florian Westphal To: Jeremy Sowden Cc: Netfilter Devel , Franta =?iso-8859-15?Q?Hanzl=EDk?= Subject: Re: [PATCH xtables-addons 2/2] xt_DHCPMAC: replaced skb_make_writable with skb_ensure_writable. Message-ID: <20190811184217.yse5h3diubi7uvas@breakpoint.cc> References: <20190811113826.5e594d8f@franta.hanzlici.cz> <20190811131617.10365-1-jeremy@azazel.net> <20190811131617.10365-2-jeremy@azazel.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190811131617.10365-2-jeremy@azazel.net> User-Agent: NeoMutt/20170113 (1.7.2) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Jeremy Sowden 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 > --- > 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".