From patchwork Mon Aug 31 12:59:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1354323 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20190108 header.b=sEE1gJqL; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bg9KJ33Hcz9sTY for ; Mon, 31 Aug 2020 23:00:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726359AbgHaNAA (ORCPT ); Mon, 31 Aug 2020 09:00:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726692AbgHaM7y (ORCPT ); Mon, 31 Aug 2020 08:59:54 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E693C061575 for ; Mon, 31 Aug 2020 05:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version: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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=9WlPHdGyUxID0dpDKjtBJJ7YyCIXSG1dIBx46WMk6hg=; b=sEE1gJqLIR4Ai+edGhmIUsBgXa 332l9qmYwXbONpDfa4fxtwXSFcO4pOezJyfbS4fnGdOxyZCgh2a8XiTFcesphz+zlBNyKTxflaAHC ZaxDIn6V3pHHEiscXj4MbMko3my0Sw6w+CG9jWmQTJjEBHfwWnPNR5XUZjqASwWY5+UG/WVcLEyje b/BZK7th4ojiFsA1fNjvNZB8r6JfL0vR4/SpFUbG2Vd6kczDWN3olbPgThKwmU5OJqnxMewwiPUIM QkRIYmwMq466TzHZ56IRZFNPrIJbMD5KBejuvT8rxHjHpKL2Z7i1jO1/DIRLSbA2bmd8XPw03iClU /k6kXFDw==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kCjPb-0002zd-RM; Mon, 31 Aug 2020 13:59:51 +0100 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH 1/2] xt_ACCOUNT: update prototype of `struct nf_sockopt_ops` `.set` call-back. Date: Mon, 31 Aug 2020 13:59:47 +0100 Message-Id: <20200831125948.22891-1-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 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 In 5.9, the `void __user` parameter has been replaced by a `sockptr`. Update `ipt_acc_set_ctl` appropriately. Signed-off-by: Jeremy Sowden --- extensions/ACCOUNT/xt_ACCOUNT.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/extensions/ACCOUNT/xt_ACCOUNT.c b/extensions/ACCOUNT/xt_ACCOUNT.c index 019f5bda007e..18e0b8a0a1b7 100644 --- a/extensions/ACCOUNT/xt_ACCOUNT.c +++ b/extensions/ACCOUNT/xt_ACCOUNT.c @@ -28,6 +28,9 @@ #include #include #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) +#include +#endif #include #include #include @@ -879,7 +882,12 @@ static int ipt_acc_handle_get_data(struct ipt_acc_net *ian, } static int ipt_acc_set_ctl(struct sock *sk, int cmd, - void *user, unsigned int len) +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0) + void *user, +#else + sockptr_t arg, +#endif + unsigned int len) { struct net *net = sock_net(sk); struct ipt_acc_net *ian = net_generic(net, ipt_acc_net_id); @@ -898,7 +906,12 @@ static int ipt_acc_set_ctl(struct sock *sk, int cmd, break; } - if (copy_from_user(&handle, user, len)) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0) + if (copy_from_user(&handle, user, len)) +#else + if (copy_from_sockptr(&handle, arg, len)) +#endif + { printk("ACCOUNT: ipt_acc_set_ctl: copy_from_user failed for " "IPT_SO_SET_HANDLE_FREE\n"); break; From patchwork Mon Aug 31 12:59:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1354322 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20190108 header.b=ssPbtdbE; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bg9KH0w45z9sTR for ; Mon, 31 Aug 2020 23:00:03 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726144AbgHaM76 (ORCPT ); Mon, 31 Aug 2020 08:59:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726526AbgHaM7y (ORCPT ); Mon, 31 Aug 2020 08:59:54 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E93ADC061573 for ; Mon, 31 Aug 2020 05:59:53 -0700 (PDT) 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=lHHO/veRb1FuPbJOeiTP2Oaad9aYoBgksTucS4LzGcM=; b=ssPbtdbEl9dyXVaUSLqbpnPYaQ k9wTh11FRzJGger6wVbszLz5psitBQptNpOqZbg2pvGrTLX/UDoLZ4Ai9vEXEkxtkNNxrPbqdFQWx 90DTyz4ATkA6rp40pP0NqYQymB0oHMhI/VbQ780BcC4fh+YRsuhLPuBhn7rNCMftRq6JiJT9hIo3z 6122fovjZo/z1SK9NT1ipsdFUpUtdZOVyBpsJyWDduffHj4kYT/FqAoE7Xjl8oWjfiYGdnmWCY+sa dwK/47sqoHcr+PErjWPiIQwMbTRx3s4389qmRT/6TvPVOA8E+WouyOKsYbYQtECVdyt1NPR9w2Qnf zboBR5Ag==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1kCjPb-0002zd-VJ; Mon, 31 Aug 2020 13:59:52 +0100 From: Jeremy Sowden To: Jan Engelhardt Cc: Netfilter Devel Subject: [PATCH 2/2] build: bump supported kernel version to 5.9. Date: Mon, 31 Aug 2020 13:59:48 +0100 Message-Id: <20200831125948.22891-2-jeremy@azazel.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200831125948.22891-1-jeremy@azazel.net> References: <20200831125948.22891-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 Signed-off-by: Jeremy Sowden --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7d779964f77d..3e4755db3542 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,7 @@ if test -n "$kbuilddir"; then echo "WARNING: Version detection did not succeed. Continue at own luck."; else echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; - if test "$kmajor" -gt 5 -o "$kmajor" -eq 5 -a "$kminor" -gt 8; then + if test "$kmajor" -gt 5 -o "$kmajor" -eq 5 -a "$kminor" -gt 9; then echo "WARNING: That kernel version is not officially supported yet. Continue at own luck."; elif test "$kmajor" -eq 5 -a "$kminor" -ge 0; then :