From: Jeremy Sowden Date: Sun, 11 Aug 2019 13:09:26 +0000 (+0100) Subject: xt_DHCPMAC: replace skb_make_writable with skb_ensure_writable X-Git-Tag: v3.4~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b14728691d73fc907839c04b9dff7e2595498546;p=thirdparty%2Fxtables-addons.git xt_DHCPMAC: replace skb_make_writable with skb_ensure_writable skb_make_writable was removed from the kernel in v5.3-rc1~140^2~370^2~1 , and its callers were converted to use skb_ensure_writable. Updated dhcpmac_tg() accordingly. Signed-off-by: Jeremy Sowden --- diff --git a/extensions/xt_DHCPMAC.c b/extensions/xt_DHCPMAC.c index 47f9534..a748cb1 100644 --- a/extensions/xt_DHCPMAC.c +++ b/extensions/xt_DHCPMAC.c @@ -96,7 +96,8 @@ 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, ip_hdrlen(skb) + sizeof(udpbuf) + + sizeof(dhcpbuf))) return NF_DROP; udph = skb_header_pointer(skb, ip_hdrlen(skb),