From patchwork Wed Aug 9 01:06:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 13348 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2515594vqr; Tue, 8 Aug 2023 19:17:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE87aWnyoQWC625XT6PcHS9DB9uxtNejCO9MFwv7VRXN5yKQyG8FYAEr5oO5VGBqFLK21Bi X-Received: by 2002:a05:6358:419f:b0:133:291:f9ac with SMTP id w31-20020a056358419f00b001330291f9acmr1307336rwc.25.1691547459690; Tue, 08 Aug 2023 19:17:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691547459; cv=none; d=google.com; s=arc-20160816; b=jjFdECsoQ5cheNVfYhZ3zalLi2sVO16xtOVDDYmf6+w/26yrlMNToRi9Si4I44PN7s oZYNkSKaarEjAFWXZ/uu3DbvrjMg2pRD7jGuk3/RmKA6MkSS207F2bYHQU18XwIm1YzL ZZn9HoTHgpyJGX7yCPIVFFp97h81TW5U+LBIeWdqsF5efdinVql1ak+ibGgmApm1rN/3 4CVQc8vJFrafmk0IHfkHj7HQpTTDTuoIyETLs/xr2DIugJEFClr3nlUC+Z6XcxCay8+D fYuWiR7q1wECx4indfNOYKGtByknfap/keZiJW93Ht+ajakcw6DdZXwMp+bpoLb9SpKu crbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=cYMuekBbj+9f4BIAzTUfsUU97y+973XUFTIbO36R3rA=; fh=XKPrIMXRcymmuVm42EqALpL6e4c/4tr+JJaDiplPt4I=; b=N24mNTWvyNV2HHxSXRnsDgyulE6OPkM9PebHkCnDuOevEudJIHZjf2wtFDPXNFuv+W QigCX5pmdY9MuQ6zYDY45RHt30v6mHdBAxN4IbDLuebJxwjESxNZRxQ6uga2BpiIx1cn PKuu3xdDTCV1t+Rx2/VCTpanRDtxvLLaIXUVeCL7y6JG/cIQytKuaPDjkAo4S/ge8CjN 1dPOw14N0t0gODfkKFFJgWbc8i/3xyjx3Vz//4c9ycdpzZV7t/f4QmNDWKgkk+AFifX2 SBirEu+VOLUOs/aBKhaWFrSEdwVQt+eY214s05tAfboJEILos7zZUxpu0BP+s7qCwuzz 5yWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="YIMsp/ge"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j186-20020a638bc3000000b00563e6387a54si3113441pge.258.2023.08.08.19.17.26; Tue, 08 Aug 2023 19:17:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="YIMsp/ge"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231277AbjHIBHl (ORCPT + 99 others); Tue, 8 Aug 2023 21:07:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229463AbjHIBHk (ORCPT ); Tue, 8 Aug 2023 21:07:40 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CCCFFB for ; Tue, 8 Aug 2023 18:07:39 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-56942667393so79031197b3.2 for ; Tue, 08 Aug 2023 18:07:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691543258; x=1692148058; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=cYMuekBbj+9f4BIAzTUfsUU97y+973XUFTIbO36R3rA=; b=YIMsp/gepK4kb1PZrGz/jrI1btP3/fBq0VS+Jtihn9KfhSn8ASHiORAJli9LUEFqQq HoxnuyBFBTo8dB+4vGMJnI9dJSLhOl/0LOqk8+JXBkWgQ0YcMOBlBgBDWTd9ZQGfUb7v v134eGbaCnhWJ6LlAN8bF4NJMexGDk2YjiUYpRwvqCcb+On066DYJ1u9PdLs/mhAWZdL P1gjm7ryz172CjgpqGQWMkMzbxADrIQ8l3m6Sj95aHIH88NNhVuWYh6o6EDtv1MxMUfp Z+g/P1Xrj3jChKB/JxAPZwQvvPTJAq11vzytlJrZk2L/TCIWjrIcFl3UwEkZphez2g1v pb1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691543258; x=1692148058; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=cYMuekBbj+9f4BIAzTUfsUU97y+973XUFTIbO36R3rA=; b=RYgh7Pl/0jRFkQVeS/ap4ToGdDMO2wKtewJRi1U0wkq0frnZujsBM0mjEfEfhYHRbF GsGTCidw4lLixGoW+UK2uoNj1bgJKlmH9UM9oWAk70WFbWhx9teRndmGulU0VhuTZbmd Uw3kqwdHJGY8p+3Azxlx5zWim/l+J85vYa1ZtPc1CDdZoem3VgJB/sup36fbq+pZuh+7 /S0njAJ/r1g/I8hm1I1fSjnBWzKFqPcxZhBZAQh2SACsyNJ6sPSKQqkUGl8IyHZsbwo2 9Xae4MzRVJFHsieMd65WmZ3zaojksDvgZRm0Wm78RZ1c+RYNn2f36lqRLJCBSiJAaz3i imVA== X-Gm-Message-State: AOJu0YzRkk1t3zv52JdL6knuASTPYlumBbe/q4oDVxED6jsmf12XEzYJ zNLAmGDCKlyzRa/+sGofjaQizET12orZQYF13A== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:860e:0:b0:d5d:511b:16da with SMTP id y14-20020a25860e000000b00d5d511b16damr23286ybk.2.1691543258744; Tue, 08 Aug 2023 18:07:38 -0700 (PDT) Date: Wed, 09 Aug 2023 01:06:03 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAHvm0mQC/13MQQrDIBCF4auEWddibIhpV71HySLa0QykGlSkJ Xj3mkA3XcziH3jfBhEDYYRbs0HATJG8qyFODeh5chYZPWuD4OLCBy6Zw7SfoSVhYB0XUrRXpXq UUDdrQEPvw3uMtWeKyYfPwed2//6k4U/KLeMMjVLYoe75ZO7We7vgWfsXjKWUL1fUF26rAAAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1691543257; l=2008; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=DjNoNzSyECOWj9GeXGlWOMxAjhA7ZpfNH4jo0ilcj8k=; b=eCNgnGJeu1Qv/WXO/mUtZaRocGNwb35CduUVrPmAFtVA5M7UN6+TZeUoZU4xYFxcchLexcVlB GpJOw23FBD2Dy+A/fk64whbFgk/e9XmhwgV8fBND3vzMDG/7xrdupwr X-Mailer: b4 0.12.3 Message-ID: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> Subject: [PATCH v2 0/7] netfilter: refactor deprecated strncpy From: Justin Stitt To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: linux-hardening@vger.kernel.org, Kees Cook , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Justin Stitt X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773705358696632241 X-GMAIL-MSGID: 1773716069417281005 `strncpy` is deprecated for use on NUL-terminated destination strings [1]. A suitable replacement is `strscpy` or `strscpy_pad` [2] due to the fact that they guarantee NUL-termination on their destination buffer argument which is _not_ the case for `strncpy`! This series of patches aims to swap out `strncpy` for more a robust and less ambiguous interface `strscpy_pad` . This patch series, if applied in its entirety, removes most if not all instances of `strncpy` in the `net/netfilter` directory. [1]: www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [2]: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html Link: https://github.com/KSPP/linux/issues/90 Related: commit 8556bceb9c40 ("netfilter: move from strlcpy with unused retval to strscpy") --- Changes in v2: - use `strscpy_pad` instead of `strscpy` since zero-padding is needed (thanks Florian and Kees) - Link to v1: https://lore.kernel.org/r/20230808-net-netfilter-v1-0-efbbe4ec60af@google.com --- Justin Stitt (7): netfilter: ipset: refactor deprecated strncpy netfilter: nf_tables: refactor deprecated strncpy netfilter: nf_tables: refactor deprecated strncpy netfilter: nft_meta: refactor deprecated strncpy netfilter: nft_osf: refactor deprecated strncpy netfilter: x_tables: refactor deprecated strncpy netfilter: xtables: refactor deprecated strncpy net/netfilter/ipset/ip_set_core.c | 10 +++++----- net/netfilter/nft_ct.c | 2 +- net/netfilter/nft_fib.c | 2 +- net/netfilter/nft_meta.c | 6 +++--- net/netfilter/nft_osf.c | 6 +++--- net/netfilter/x_tables.c | 5 ++--- net/netfilter/xt_repldata.h | 2 +- 7 files changed, 16 insertions(+), 17 deletions(-) --- base-commit: 14f9643dc90adea074a0ffb7a17d337eafc6a5cc change-id: 20230807-net-netfilter-4027219bb6e7 Best regards, -- Justin Stitt