From patchwork Sun Aug 11 13:16:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1145320 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.b="MNBcHPBW"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 465zyD3Wdnz9sN1 for ; Sun, 11 Aug 2019 23:16:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726424AbfHKNQS (ORCPT ); Sun, 11 Aug 2019 09:16:18 -0400 Received: from kadath.azazel.net ([81.187.231.250]:55498 "EHLO kadath.azazel.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbfHKNQS (ORCPT ); Sun, 11 Aug 2019 09:16:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=qgQ0vT5/nzmmJnVDJE3cIj+Alisr1zIlKRpFPgtMe34=; b=MNBcHPBWm/bXDpWDHm89sRiZBC pP+7H3UShI4aY7v5bzjf1elZznAEfOd4pxJBrjG87ebXG2IdT+H86YrUZngR1n5edcuzCttVzov8z 1NZPo3ss/OhuetnRLOzFpQfhGJidGIoAZOtIm452TK1hZQ/l81bVf/dzCrU4XbBvlvCrwtxqN5j2K MRMrITtFqtP2aA/gvu6rJz6ZhPrhwVZQc3us1i0aZfcqhdwb0P6Tj8W+jCfpkI19divk9NG6aMlzt MByKdCCjRX4q2Ph9r1TA5/EvhgKXCwJEW4SHm5B3wPbek8CVb74g26eUz1H1ooUKEphn8KHqL8Gjj Ee2OcTcw==; Received: from [2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae] (helo=ulthar.dreamlands) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1hwnhp-0002CN-Mj; Sun, 11 Aug 2019 14:16:17 +0100 From: Jeremy Sowden To: Netfilter Devel Cc: =?utf-8?q?Franta_Hanzl=C3=ADk?= Subject: [PATCH xtables-addons 2/2] xt_DHCPMAC: replaced skb_make_writable with skb_ensure_writable. Date: Sun, 11 Aug 2019 14:16:17 +0100 Message-Id: <20190811131617.10365-2-jeremy@azazel.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190811131617.10365-1-jeremy@azazel.net> References: <20190811113826.5e594d8f@franta.hanzlici.cz> <20190811131617.10365-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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; udph = skb_header_pointer(skb, ip_hdrlen(skb),