From patchwork Wed Aug 9 01:06:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 133019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2507334vqr; Tue, 8 Aug 2023 18:53:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEKQ68bPnBT8IaU8FhD84Ma1+e+rH3VILT1d5dCnVRVNarccquKmvEIA3utVfeKFC2cxPM6 X-Received: by 2002:a05:620a:bc8:b0:767:4016:29f3 with SMTP id s8-20020a05620a0bc800b00767401629f3mr1753633qki.58.1691546015402; Tue, 08 Aug 2023 18:53:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691546015; cv=none; d=google.com; s=arc-20160816; b=LXT6rXxFxex1yIRH2o1WCFbl28CwhAGJ7VAzWrJVVzW7yUDmTXVl15LooXVr9aZh90 i/luDM62uj/DsYwXwChfe0qz0dqQcoKgUxFZU7E1Exj2I+bBJTM9Mcm/9xuOuy/4EPFs t0/lonCVvswRDLkzGDQ5FWeZQk9pcJwvHSNNJJvx8BNfactfXsPnSIcxz5xGSEj7OTWT iMiJPgY+5AuFRHJgl9s/IRpQukak5kPxTsXIBidHVGXCKRZzNx2MWUFHH6Vyf1e/kub6 IrODZwLGZ/gv/et2sznOj0UNNtkQYkadQIoJ2Iy3mCaloaXFA/Yy8jqDUUplVlw6PNCT B7UA== 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:references :mime-version:in-reply-to:date:dkim-signature; bh=Z+tC2OHCgG5XmqiAIey5dLzPjagreIQB12mmbHFSSNo=; fh=XKPrIMXRcymmuVm42EqALpL6e4c/4tr+JJaDiplPt4I=; b=UY8M0DkwJBqrL/AW4e9C7+Dm67E1D65EJoMYs3tgj5pTmGd5ScUmg+kJdH9aCXrDaM 1ZSd4iuKEyS5xlJTB5nFMGMTz7DGM5ezOcAYz8C1nPhQ4rnbggMkgabKZpzP+g5SfWBM HlmCH8U1EAg85JLubfZd9HZYHpKxaLiA8zGa8m63ArrfX2GFZZgItqx80Vsg5Q4nd6BD 3nNqSfB4/PNtqQiiCkdIMVJgOt6giZRNOX3oxyZkU6hfbfhQb/yqfYlJvL480jlpTW4r ZGrzblXJ+moyS53JblpZUkaDcqYMMTOpNgJtLDyc71ENR7Uua2jz6HJnLlJAg/cQWnTv 7Ncw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=5JRTgmSs; 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 h128-20020a636c86000000b00565325c6ca6si576727pgc.489.2023.08.08.18.53.23; Tue, 08 Aug 2023 18:53:35 -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=5JRTgmSs; 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 S231415AbjHIBHo (ORCPT + 99 others); Tue, 8 Aug 2023 21:07:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231209AbjHIBHl (ORCPT ); Tue, 8 Aug 2023 21:07:41 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84487FB for ; Tue, 8 Aug 2023 18:07:40 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5896bdb0b18so8658607b3.1 for ; Tue, 08 Aug 2023 18:07:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691543260; x=1692148060; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Z+tC2OHCgG5XmqiAIey5dLzPjagreIQB12mmbHFSSNo=; b=5JRTgmSsbAoRmHzig2ooFuZzDECsMi9JEIoaVYPweJLMD0+XXzlzcJt8H9fsFmsAnJ EfCDpuZIUrACTWFeTO+popab/TH0zhMmxgdHI4aqx4VnIEK2ZhCooYIl4kN1hxgYWMC+ 9TX6rmB6YqfYm7DH+iukazZ2O6DXiOG8t2n7/TTdMW2Oa9DNustLZ9yg9+pn50Xahhia BbbZZ3Iq4rcAOk1eHuS0ec2RaoJ/1v/BBVcqa1F6TLNvETcA5Z8gJ0JjVwcuaDVBVdbP IQczCbssQ/4eAtUSD4VeHNVc1qBo6gUNo//DbTKx490J4SVtBHv+kn3Rw5kbhdebliTv 2sOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691543260; x=1692148060; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Z+tC2OHCgG5XmqiAIey5dLzPjagreIQB12mmbHFSSNo=; b=DYtQVadsWcrkPhsdVYIQRs5Yi0IIx6AQoFiD1MNAkPxWezpqluCr2nWfrxyEqdXErx rtwaRMpHlJaZuLhlVkWms06+N+xk/FX8UM5cDpIZMsWM+AGvzhinjZ1Njenc3+eS8p0R 4DfCdGY0onRR9jyiMCSXkzr3xkjLRIQwcz96MQ7nv0MGZcz1Agp2upYX9ijlvGZ2eQvg g31qFowhj+s8zRIwlIb+7kuf9CzlT0bNQHxR4rxL6yz53Ilf4uQ3VSVk1nmcwvegmzoI IEOXNr02hM2uam9KnzhY46peDm5hV3Pbg8ICsc0rI1fzg4EVzlAuxUfRFzz4ugPgQjwH g5YQ== X-Gm-Message-State: AOJu0YzdKgAW0PSNETQWfphif6doeDLES8agOArBeW/TlDsN0FWVrBWV oIokHEmszKTgivb2od0dTYHneyf/T41dKHyvLw== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:690c:3512:b0:57a:6019:62aa with SMTP id fq18-20020a05690c351200b0057a601962aamr192719ywb.5.1691543259866; Tue, 08 Aug 2023 18:07:39 -0700 (PDT) Date: Wed, 09 Aug 2023 01:06:04 +0000 In-Reply-To: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> Mime-Version: 1.0 References: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1691543257; l=1642; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=9CkxZqRZItVdJRKZDRTDHxT2lccsnPMJcsOENM5+Qdc=; b=85tSDIm6bOF0lYA+JmVaeoX1tIRMiVSHTcgdhXNIXdzyciIDHIFVMzodOJMDLgH46wLpyVO/h DVLt9rM2ys1DroSaqJdpej95V5f3jE3hmrIH2ifRXpzmpU3fsAWCaNc X-Mailer: b4 0.12.3 Message-ID: <20230809-net-netfilter-v2-1-5847d707ec0a@google.com> Subject: [PATCH v2 1/7] netfilter: ipset: 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=unavailable 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: 1773714554637400181 X-GMAIL-MSGID: 1773714554637400181 Use `strscpy_pad` instead of `strncpy`. Link: https://github.com/KSPP/linux/issues/90 Cc: linux-hardening@vger.kernel.org Signed-off-by: Justin Stitt --- net/netfilter/ipset/ip_set_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index 0b68e2e2824e..e564b5174261 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -872,7 +872,7 @@ ip_set_name_byindex(struct net *net, ip_set_id_t index, char *name) BUG_ON(!set); read_lock_bh(&ip_set_ref_lock); - strncpy(name, set->name, IPSET_MAXNAMELEN); + strscpy_pad(name, set->name, IPSET_MAXNAMELEN); read_unlock_bh(&ip_set_ref_lock); } EXPORT_SYMBOL_GPL(ip_set_name_byindex); @@ -1326,7 +1326,7 @@ static int ip_set_rename(struct sk_buff *skb, const struct nfnl_info *info, goto out; } } - strncpy(set->name, name2, IPSET_MAXNAMELEN); + strscpy_pad(set->name, name2, IPSET_MAXNAMELEN); out: write_unlock_bh(&ip_set_ref_lock); @@ -1380,9 +1380,9 @@ static int ip_set_swap(struct sk_buff *skb, const struct nfnl_info *info, return -EBUSY; } - strncpy(from_name, from->name, IPSET_MAXNAMELEN); - strncpy(from->name, to->name, IPSET_MAXNAMELEN); - strncpy(to->name, from_name, IPSET_MAXNAMELEN); + strscpy_pad(from_name, from->name, IPSET_MAXNAMELEN); + strscpy_pad(from->name, to->name, IPSET_MAXNAMELEN); + strscpy_pad(to->name, from_name, IPSET_MAXNAMELEN); swap(from->ref, to->ref); ip_set(inst, from_id) = to; From patchwork Wed Aug 9 01:06:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 133031 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2519150vqr; Tue, 8 Aug 2023 19:28:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEX04mD344cj01cG045BRZYRRyEhqL68JoDuht3remKH9CZiZmd80pkiV1p3v9dVq/luZxG X-Received: by 2002:a37:e118:0:b0:76c:e977:9856 with SMTP id c24-20020a37e118000000b0076ce9779856mr1409342qkm.72.1691548132057; Tue, 08 Aug 2023 19:28:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691548132; cv=none; d=google.com; s=arc-20160816; b=kk4mTfuZK2xKmVliACq/YBWcxSqay+Kpqtqf+1wTP45rxolB7lOggOWWRVVL0TrNPd /LroxoFEb0uYzKWsW+gdZxXg2ryXAUvP3NnGVyixaFR6PaYYQyz7P3e3/byTQg5e/jnG DB0wib93LCTbgVRraa9N+aTjrbRdhhpDMMMglNwhvwTtvduvmcUFKMFvQFPGZk9OZruS 03vAPhr6pr8ytriunZfH5ac1sG6QVh4N7QrWV2XNAgPu1hFppHaUAcFUB/KUvH0QHhDO qECDvXIvQYPdINYo3WwFyLKOkOKeAbiCj97Z8enq2ELFRLbQmAs+FThBlPHMosWdKBKe M0pQ== 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:references :mime-version:in-reply-to:date:dkim-signature; bh=8kynZ2eY0/O6E/bQJdWZNL+mmpUwUSkdwurja4abucs=; fh=XKPrIMXRcymmuVm42EqALpL6e4c/4tr+JJaDiplPt4I=; b=BSBz9zhnvrwev39nsKP/66iks2NEGrooPd0MNsNmCmBtKkQLNKBHGqZHwTWhNINI+S BEN4zL7Fv/B7kubLVG7l8RuQYPT+Vfvj/+Ip19zjhfV6dH6zAj/2o/DldG82T+S5Qckh fV9t6CIG12gcKVSJudQIIPyC2hRulvPtA/SbUPZRhwCB0nuieiKJD+ySQ7CVi6gEM8x1 RANpyyfGFvOYNNe52aPDFFI/SIUASMGSZxU3kcRH+T4iv777rPfwfcZueZp3YM2ZkW8L yNaEraWokOhjE0qfaJcDEI1MeDwPPRz8xdODgmERkMlUT7bAVtDkLGWIflyhp/UxhAd+ 2v8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=Ol0O7ydB; 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 m14-20020a633f0e000000b005645d9a89d6si5957707pga.554.2023.08.08.19.28.39; Tue, 08 Aug 2023 19:28:51 -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=Ol0O7ydB; 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 S231455AbjHIBHq (ORCPT + 99 others); Tue, 8 Aug 2023 21:07:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231359AbjHIBHm (ORCPT ); Tue, 8 Aug 2023 21:07:42 -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 880571BC1 for ; Tue, 8 Aug 2023 18:07:41 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-585fb08172bso75084927b3.2 for ; Tue, 08 Aug 2023 18:07:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691543261; x=1692148061; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=8kynZ2eY0/O6E/bQJdWZNL+mmpUwUSkdwurja4abucs=; b=Ol0O7ydBLmDGDB+SZ9v11BQgV4K8njIy76TSgXpaauJtbgStqpW/RYu/DWTxMxv5ZB +9MacsQSpkAhtOY9LVIFSQQtbwXVuIBhhpzOiV/EdBvEkZB/SRk8+/hM3Av3riZbSVSG QtCWUqHY7ASjZgsslXjvn1A8l6P037btB4PjAGygJPGdrTpttKYWlOta5a139Ww0nVw2 4wZvofllE9KdG42dhpE4GXt+mC+sxQs7bOpHb0LRCj1twgqrLPVTJYEBe17+KyMG8QjB UtPRDLE2isjgjcvvsvJSfiJwpN73phog9iVfBbXoVUO8z8mhgWMyyQoeNpXAgTDKPl0/ qpJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691543261; x=1692148061; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8kynZ2eY0/O6E/bQJdWZNL+mmpUwUSkdwurja4abucs=; b=cXB7rZCPOnfSaVhdl9yfSJtnqPn0EqExdgPUB+21lyF08ehRczNq+qcusgkK7Aiefj Wr0F0ATH048VwvJbb4Ffq9UeQfaMt4dhEw7xERDQOh+ZJ2ycKDVw7NqGC2K7s40fDXa5 MRXIabZWRCJB6Wb9aji86EHIhOdzigXX3yOr/3OcE0+6OV+kp6+VBAts64bk6uQVeOyN 4W5nTFOfSRXB5WUVv3EMg/z6ejYq4e9u8VgWbIlyx7QYqUm1XfvhbrW6g9iURYHz5f6P NnV7SP0G0TANsSxtA2u1ueGrIyAOU5AMasw2QRPMfOjZbRakF72Q4jNUAOga0ujCv+XT p2Nw== X-Gm-Message-State: AOJu0YwZOrukuORZ/e/aOzo+iZjjgPGJkWvaKmDCjSg5CaYn0xeAwbGm XKrbVXIP8PSPUTb9FC4xOaJLqhgVOFJq/O4mjQ== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a5b:181:0:b0:d4f:d7a5:ba3b with SMTP id r1-20020a5b0181000000b00d4fd7a5ba3bmr30722ybl.8.1691543260881; Tue, 08 Aug 2023 18:07:40 -0700 (PDT) Date: Wed, 09 Aug 2023 01:06:05 +0000 In-Reply-To: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> Mime-Version: 1.0 References: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1691543258; l=903; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=GfuXN5T5xhe6k6w3cRknlOVNIOtegqmz8uQBUV4/tcw=; b=GYSS0ZoTuERfJ/SVnofWzjum44puD5h0s+zSjx2gITL2EhREYqCQpVB9N07nRO0v9d+gxkHdQ SOb7icKznTnC9EnhPquUOW6p8PVJ2Ep9ughhPfdNGQsR/NcIvz+Wupm X-Mailer: b4 0.12.3 Message-ID: <20230809-net-netfilter-v2-2-5847d707ec0a@google.com> Subject: [PATCH v2 2/7] netfilter: nf_tables: 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=unavailable 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: 1773716003052604320 X-GMAIL-MSGID: 1773716773948853945 Prefer `strscpy_pad` over `strncpy`. Signed-off-by: Justin Stitt --- Note: Opt for `strscpy_pad` over `strscpy` since padding is wanted [1] Link: https://lore.kernel.org/all/20230808234001.GJ9741@breakpoint.cc/ [1] --- net/netfilter/nft_ct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c index 38958e067aa8..bbf11c4871b2 100644 --- a/net/netfilter/nft_ct.c +++ b/net/netfilter/nft_ct.c @@ -108,7 +108,7 @@ static void nft_ct_get_eval(const struct nft_expr *expr, helper = rcu_dereference(help->helper); if (helper == NULL) goto err; - strncpy((char *)dest, helper->name, NF_CT_HELPER_NAME_LEN); + strscpy_pad((char *)dest, helper->name, NF_CT_HELPER_NAME_LEN); return; #ifdef CONFIG_NF_CONNTRACK_LABELS case NFT_CT_LABELS: { From patchwork Wed Aug 9 01:06:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 133028 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2515268vqr; Tue, 8 Aug 2023 19:16:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHOpvowlw/KB8xzgCVjXlC/Hn+sA2S3AXNYzta3+2Lz/7zTI09JEr0JpRAupWPgsT84atZE X-Received: by 2002:a05:6a20:1591:b0:134:73f6:5832 with SMTP id h17-20020a056a20159100b0013473f65832mr2184779pzj.16.1691547397064; Tue, 08 Aug 2023 19:16:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691547397; cv=none; d=google.com; s=arc-20160816; b=U2v6OipQXXJivCFSgq2N6ThT9S1bWf388SQ3o8ZmMe48ZSPjYF9HngOn+ZBP9hQEsT O85gy30NjhefvjWM8fGz7fDlbuAtKiO3NF52Aoazrh1xdhS9226U4kBFcwcKX/y91rI3 l6aU8aHUNb7kd1vPCIR5+n4sGejjOhjUiY3n0OMCHtjULkfRO7tVzZcKw0tmCLmcvfNA 42+IS5VB/DuWIn8eXLtV3rTfy0hk3kjiqN47huqU+CEodnDV3OPLkG/HyklrlvYlI2p1 O9AM/tjfgPnt79pdyMIakmZO7u53SSM7oWvlax05JiPijPPVcCfegAGMgXD5MIKHKegi c+eg== 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:references :mime-version:in-reply-to:date:dkim-signature; bh=CVz1ojRkhYeSRtVo9H/tM0do8XQLIQHE9IgccPkP+yI=; fh=XKPrIMXRcymmuVm42EqALpL6e4c/4tr+JJaDiplPt4I=; b=shoDsYBKkzydtxLOs5r6BqS5e2NOL5Z2bV5oi9EVFRJI5F1phkqSU065BX376VNeWk XEOYyXiVP3kyjlPLSTxqDDazYXm3OReygNLwaylPJeXKEFcxFhdyDKole6E0dE5UoucH J7pKXWFLsFbkjBsVuAYq4KB57+kTpLdtL8iR7/NPE9K3bNehD1bRcJO40+oCAoU7jJ/j e7HdhR4d6tN1r1tK9fhUoX/yHrHwsvTMCHscyGK3l1zTCawpDWp1d6zzPvvGzPYCr8yR hRwdhxcYwyLfcrqL9jNT13EBtNMoeUINM3WnV2FB7rRWTJ4LrRNHgoU/bxPHWBPU3WBP vmUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=YM0EF08L; 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 s8-20020a639248000000b00563e83a3921si8143562pgn.891.2023.08.08.19.16.24; Tue, 08 Aug 2023 19:16:37 -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=YM0EF08L; 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 S230397AbjHIBHs (ORCPT + 99 others); Tue, 8 Aug 2023 21:07:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231390AbjHIBHn (ORCPT ); Tue, 8 Aug 2023 21:07:43 -0400 Received: from mail-oi1-x249.google.com (mail-oi1-x249.google.com [IPv6:2607:f8b0:4864:20::249]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE0B319AD for ; Tue, 8 Aug 2023 18:07:42 -0700 (PDT) Received: by mail-oi1-x249.google.com with SMTP id 5614622812f47-3a3a70425b4so11691830b6e.3 for ; Tue, 08 Aug 2023 18:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691543262; x=1692148062; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=CVz1ojRkhYeSRtVo9H/tM0do8XQLIQHE9IgccPkP+yI=; b=YM0EF08LMQ5WvMrXeAp8gjjtszwUk2pUWzHCMZ0zn+G2isYfsms0AEcAOJHR+FzqoJ 5gGzXyXgO1s6N6jbssTgI6zymokr1AXoo+FhWaVJg4ihaxML7ucWHHuIxbr5HzCvt2MG Tt3yOmk7P8lv4yKQX63qFntp01EHrSBjsYSJq/s2dMp7zCD1Je4SxOgsOQ9tGtmEzCoe SpySLAiirdXb9RHkLdoS1GVfBe+V+nm33FdHqqxIkhu9U007DhL2rTOQ0/2K+sDSPX6C uGWsZ8A2DtO3QHV8XEPMcKLOS6G2USuAt/czHn56zM0QWZ4AQUFXQcNZZzbRLXv8blyO iMnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691543262; x=1692148062; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CVz1ojRkhYeSRtVo9H/tM0do8XQLIQHE9IgccPkP+yI=; b=AxttddBuOuafYOashdgK37OX+I7HD/m8JUfDoR4ualYZYGpyQJEmLMXcGXwx1N7irn tdBCseqrajqMBiAcF5LIJncq1vwCBKRvS3qCY6pgmysRNT2Wb7WUqtXpxrCxDGqkIBXu OWMZ2O9KyO0q/CaLCQtb4aqCXPBw8oH7reY782Q+PMP3lEjMiX2I6C+5F4ELuNy8ebFB T/Q74Auscm1WQBIHXl1V+uNf2bg9GBlwXtZZ0HGyVxiyvAwuBNrAQ8pIck2g71h52zek D9d3tIV0S0jna3lzf7NV7tDyKGv/iFEr6kpCDJgdYU13x94NmtjdcDeqhudcEszFerTM TIQg== X-Gm-Message-State: AOJu0YxpA32OxtRWSOu/cGmYVkj5P4BkEgLXgAmurDiFHzxtOhsplP2M Y7vCJXyknFhPxOPsj0w3ChZ8PcRgQCE/4bn+Lg== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:6808:1594:b0:3a4:18d1:1686 with SMTP id t20-20020a056808159400b003a418d11686mr793268oiw.10.1691543262146; Tue, 08 Aug 2023 18:07:42 -0700 (PDT) Date: Wed, 09 Aug 2023 01:06:06 +0000 In-Reply-To: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> Mime-Version: 1.0 References: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1691543258; l=692; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=Rb7knhgVRoO1cFP5KZBOoghV8KJqLMcT0yWjrGm/ENU=; b=SGRqAQLRAvrm1QwRllI6+LYWlBGAQP3OWJJwRohe3cZ2RB+HyT7yASIlpFuvkLVwAhf0uTtpO XHh1FrAHIHoC+nIE6P/23cWFGuKLtpQSj4dwTByKp1fsGBUz1TyiFoX X-Mailer: b4 0.12.3 Message-ID: <20230809-net-netfilter-v2-3-5847d707ec0a@google.com> Subject: [PATCH v2 3/7] netfilter: nf_tables: 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=unavailable 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: 1773716003052604320 X-GMAIL-MSGID: 1773716003052604320 Prefer `strscpy_pad` over `strncpy`. Signed-off-by: Justin Stitt --- net/netfilter/nft_fib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nft_fib.c b/net/netfilter/nft_fib.c index 6e049fd48760..8c250a47a3b4 100644 --- a/net/netfilter/nft_fib.c +++ b/net/netfilter/nft_fib.c @@ -150,7 +150,7 @@ void nft_fib_store_result(void *reg, const struct nft_fib *priv, if (priv->flags & NFTA_FIB_F_PRESENT) *dreg = !!dev; else - strncpy(reg, dev ? dev->name : "", IFNAMSIZ); + strscpy_pad(reg, dev ? dev->name : "", IFNAMSIZ); break; default: WARN_ON_ONCE(1); From patchwork Wed Aug 9 01:06:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 133050 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2547072vqr; Tue, 8 Aug 2023 20:54:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHd/RCpDjV2QciM2q9Mm4dRlwhIZZRQkiJLDtp04mvkLShSlKdxHNBpXW8Y4nyEY3xaQbQL X-Received: by 2002:a17:907:a041:b0:991:bf04:2047 with SMTP id gz1-20020a170907a04100b00991bf042047mr1051029ejc.14.1691553274141; Tue, 08 Aug 2023 20:54:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691553274; cv=none; d=google.com; s=arc-20160816; b=CYNKra6hNs4yG8jw5TZcnt6Pu36/mzk6plkDp6RDic78rzKJbVgD9hh+YaHCyh+GwB Rnw2vB/9YWpVWng8dmN1IpZoOajY1wp/woOQ2+7YJa6gyBdcHH8Fgh15al9y0ItEG7LI d1drOrEk7TDbixAymJ03cH+8kOa789XNaYQVVE00IIVrg0z9e+K1UeQdcEOOz4aho4F8 DWw29g4tNwYqvuhVL+Nv+B86gt/sXVvL6KCqR8vDVKGMSRBXtIWYXSVtM4PmRuyzSkF4 juekqYZdVFBjWqvXw9vUDcliTLCNHWRsPjjPAslDDGqyxzCO5k/1vU6N+OVO1HK7boYt 7jVw== 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:references :mime-version:in-reply-to:date:dkim-signature; bh=Ib6nqOI6OhZk9uVMuCMDveLdue/VtxmtzrsTXPIDYRI=; fh=XKPrIMXRcymmuVm42EqALpL6e4c/4tr+JJaDiplPt4I=; b=KNCTQHjI3m39nOAMOFRc0/N0LsbymivI2U6nFO4H0S2EzA7i2qboCTrMbpzWa2qo7A n7omFZf/BEHHvl1HHReuabRebDr8xsflWYJx6v0huLXHfjUyi5w7t45ylfnctID/k9i0 PxzZea6l4uZieqg67NwsUWvEl4SjKZZ4yPrxTZtWZu2v7vdX9EWCJnyLV1e8iLdv1XfZ K5Gm1elu/JCQdXqmMqUVmEgBDomOCtSOAurIlZ62LcjEyTomQmKN0x+Tfb0rGNF0Prjg uMDuZ09KKN6B2jJzOZpEbQ99xqQpCh5saP5SbmhdnDwSdUCIgj2/++kQGp7zRmdyIhqh BYXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=ZoQqX5UI; 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 e26-20020a170906c01a00b0098df03ffa69si8116750ejz.421.2023.08.08.20.54.11; Tue, 08 Aug 2023 20:54:34 -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=ZoQqX5UI; 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 S231489AbjHIBHu (ORCPT + 99 others); Tue, 8 Aug 2023 21:07:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231424AbjHIBHo (ORCPT ); Tue, 8 Aug 2023 21:07:44 -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 0E5881BCD for ; Tue, 8 Aug 2023 18:07:44 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-583312344e7so79128447b3.1 for ; Tue, 08 Aug 2023 18:07:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691543263; x=1692148063; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Ib6nqOI6OhZk9uVMuCMDveLdue/VtxmtzrsTXPIDYRI=; b=ZoQqX5UIeq1jO5/Y5J5W2a7PzzXsb8d0S2K9nNc0sxvuHfEUau2nSLFvWWx5TabJYG 9AjCKoQscaQ3FibFIL636z6Qkx9MWiHi+jZzcS09eay2ZGG8ou0eqWAgykq7xE935CdT Y/BBWwHMbzudYeSVdUcGcDGZAbpW2ULHrvSazCEcoWFyxdgAZRZLgJVtM3QvN5w995cD 4gKNjSaX2/YVLXjoYMhH6jmDrKOeTQd47uGISSSDdR/wLa+Fr8lRe9HTNHcg+y0+ZlpS kC53/iPBs+RI23nXLKLuKb3pyVovbV5P1iJTe8dt2Rr+HJB4qllUtIoJ/lAhndvVoFC4 KPSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691543263; x=1692148063; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ib6nqOI6OhZk9uVMuCMDveLdue/VtxmtzrsTXPIDYRI=; b=UbfkbQRWG5Dl81zQc8TJmWBVXNurTHDNKH6PbkEvpKf8cL8AdLnatUMWRI1sQ8HA9v bPrDoBwL9QM5RR135skIQxEySGYmfE+VNXNI3I2XV1eJVSNRIX1ZH4/tD8I0YsP4ugq3 NgAX0SWGdBAn9jlB9wlzOi2DII4l8JXEXTIWlWWyQU94vdMOaCt8tfdpEaz324zUXtAC Zh0hPXRgWP5C4yqbCvmJTBm3YwLiL3uBa0mG7oBnkl1HvlzF0lCq8ojE5LeKqVLLMHMB Rma15h57vjzBSR0AfKsQVf9QPUAxS8EDe5qWYNOVC1Esw9IrAXidT63KVpP5dPvbI3z1 p49Q== X-Gm-Message-State: AOJu0YwOSuiv0uOgEnO3O6E8e0uimNQdBCwwdoROiEeLkvhqKjjS8LKO RafMbirg90fLXsacUVHIc8IuUCXk7LwuCYPQqg== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:ab62:0:b0:d4c:f456:d54f with SMTP id u89-20020a25ab62000000b00d4cf456d54fmr22714ybi.8.1691543263329; Tue, 08 Aug 2023 18:07:43 -0700 (PDT) Date: Wed, 09 Aug 2023 01:06:07 +0000 In-Reply-To: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> Mime-Version: 1.0 References: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1691543258; l=1342; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=7ETYnKTeQUVzYvHKo3dCw3Fgg8Ju8JACIFGAct1WkOg=; b=vu0OZUT90qel7Bct4/ripVcEolXMpugmp7bRnKPUqOl8EyTjsFcrN5q5j/s4LBuhdPWIHYjOi wh7kSdYgds5BsJcyjEsLKuA3/gws5T6+wjRr5B/LR0IzcPd3PBc/Kf/ X-Mailer: b4 0.12.3 Message-ID: <20230809-net-netfilter-v2-4-5847d707ec0a@google.com> Subject: [PATCH v2 4/7] netfilter: nft_meta: 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: 1773722165933100531 X-GMAIL-MSGID: 1773722165933100531 Prefer `strscpy_pad` to `strncpy`. Signed-off-by: Justin Stitt --- net/netfilter/nft_meta.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c index 8fdc7318c03c..f7da7c43333b 100644 --- a/net/netfilter/nft_meta.c +++ b/net/netfilter/nft_meta.c @@ -185,12 +185,12 @@ static noinline bool nft_meta_get_eval_kind(enum nft_meta_keys key, case NFT_META_IIFKIND: if (!in || !in->rtnl_link_ops) return false; - strncpy((char *)dest, in->rtnl_link_ops->kind, IFNAMSIZ); + strscpy_pad((char *)dest, in->rtnl_link_ops->kind, IFNAMSIZ); break; case NFT_META_OIFKIND: if (!out || !out->rtnl_link_ops) return false; - strncpy((char *)dest, out->rtnl_link_ops->kind, IFNAMSIZ); + strscpy_pad((char *)dest, out->rtnl_link_ops->kind, IFNAMSIZ); break; default: return false; @@ -206,7 +206,7 @@ static void nft_meta_store_ifindex(u32 *dest, const struct net_device *dev) static void nft_meta_store_ifname(u32 *dest, const struct net_device *dev) { - strncpy((char *)dest, dev ? dev->name : "", IFNAMSIZ); + strscpy_pad((char *)dest, dev ? dev->name : "", IFNAMSIZ); } static bool nft_meta_store_iftype(u32 *dest, const struct net_device *dev) From patchwork Wed Aug 9 01:06:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 133017 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2504998vqr; Tue, 8 Aug 2023 18:45:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEubSD2I/rGxqhJtGki4K4TwTRLIcx4PcQExGXw7pl68SycjHtke2lKOk66NZgmqPWdwT0U X-Received: by 2002:a05:6870:611e:b0:1ba:6180:ff47 with SMTP id s30-20020a056870611e00b001ba6180ff47mr1536369oae.21.1691545544832; Tue, 08 Aug 2023 18:45:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691545544; cv=none; d=google.com; s=arc-20160816; b=Wqurra+LnRzsN+ofx8NfaWWC14hU/9nBT20bwUfOoZRKZWKIoHHbV1RBv1JVKcODUH sIqj+Yh2Dz119nC0i1dmwukvAvK9tlM8aGM4HuHYZVbOb1HCkaiUvqugi5xjq4eWVtR/ neiFye0TOZAyazVa/6ga82oFj5/wkPi7eVpA5GuFMIeIbPVM73vN8MdkY5FM1rq+fM/S YQw8zpHb4BFTsKWVvfV1ACpnpDHoGopKDlwpkd4+EJ/+sXs2qnApvrgicNbQ49XVsE1d wj9zhDIqSNMHPrpeF0864lhJQBCeSJEeGr/J4nF5HXjNYrYmB9QRhK30jRcHHBh2iON4 UMyA== 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:references :mime-version:in-reply-to:date:dkim-signature; bh=1ONd/JWe6ZkZveFErN2MpT8R9y0a9lN9YX7PcEW+G4U=; fh=XKPrIMXRcymmuVm42EqALpL6e4c/4tr+JJaDiplPt4I=; b=DzqY7KwLPxunFCuchsLI5JsCh1eZai/NsuAuiFTAxA+xKWyJlkKse/mDuIbzby++nQ ocx5/NO6uQwSwTOLsXw6QQl6JWRXgvCNWJFNAz+C8gKfgvq1r23g+F5KDQL8CarMBj4r Kx6xyXzkOOfJBXt2mcTxc+9M82CLoCBAqjZdka7r6Eik4Q91qKut8xAw0jRxpSGv2H04 /a8vaVfvOAH4AzbxN6OmIeExeECHptDh8vpxViPfdwyxEPBaviTcLtOALu7vhZ7LiLfq cNBswcdMtEYNRwNc+QtxsVgKZXSv4oW5khZsMK9XIy0xOLzJkz5MUjoEnw0z4pMJuYwc mx4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=uQLE6smT; 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 fy20-20020a17090b021400b0026305080a6fsi376513pjb.63.2023.08.08.18.45.32; Tue, 08 Aug 2023 18:45:44 -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=uQLE6smT; 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 S231476AbjHIBHy (ORCPT + 99 others); Tue, 8 Aug 2023 21:07:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231458AbjHIBHq (ORCPT ); Tue, 8 Aug 2023 21:07:46 -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 3D6101BC1 for ; Tue, 8 Aug 2023 18:07:45 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-58440eb872aso82395537b3.3 for ; Tue, 08 Aug 2023 18:07:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691543264; x=1692148064; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=1ONd/JWe6ZkZveFErN2MpT8R9y0a9lN9YX7PcEW+G4U=; b=uQLE6smTxRX1leyrpUsBgAjJ8PIzUdv4bviLmq+pneR9cFdSU81LNgBj+5zuPWMTxv ZM+VYE9mpr2gXAT1BU9K9ORDZWFt70DUua28vGnkl8D3+KaywwJSdYhS8lqshy7QqWwK G+2L0rkCIlBTkycm7qrfg7AfR+xtQjGOD7PUyy8qLs3XjElgbidIsCcvAH7scOt0SmIX 1oF6rcbfsf4gyeuw/xehVb+CLcLzD+5+XKYgaYVIf56BFnyjz9pG6/dECj4OImbuGJ2U 4Lto6ebxG3IOzK1sq10U3j3lMzewZz23wET6IRt9JzgFF5dwLLCVRgt4xKV9ypEvUIZm kPog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691543264; x=1692148064; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1ONd/JWe6ZkZveFErN2MpT8R9y0a9lN9YX7PcEW+G4U=; b=ALtcpY7JuhqRjMOWDOHEmoXdWgdaF2UfxLL7ju67W+CwEG3iFOMhk8/lAdDenaBMRI jNnj+sdf3FXYIXl8g7t7fvXmm5OZE9jCivly7vkokXJYRlC+/u2JwOBHk187xeaklpgf tYrdB80ENQLgGqHR7ixMu6dWP6ztBgnndzW8drFhOzB7srMHAwW6PbT+gkeRbLCcRPNj p6sJepcMbzy2nxmqYj9oXNKTAWuYHwSxorVZ2lwHuJHpgERHNgdM5bLlNsMS3zcug84w HrN62g9Sr8Car2ycG5wI8ERGOXZ8r8/2InMlW4iYnGWuYEuwmTPirCXkrN1Quaz6dyEf E0xQ== X-Gm-Message-State: AOJu0YzIfmYW90cB+3kMHrfJ3cx+5emz1JWNRmKo8VCzDfdc9aCN0siJ l2HLWaepI/PVjiPU7XYMXxrsrQzKUXh+ImMBgA== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:d383:0:b0:c72:2386:7d26 with SMTP id e125-20020a25d383000000b00c7223867d26mr29048ybf.0.1691543264480; Tue, 08 Aug 2023 18:07:44 -0700 (PDT) Date: Wed, 09 Aug 2023 01:06:08 +0000 In-Reply-To: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> Mime-Version: 1.0 References: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1691543258; l=1715; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=KAM/QyHZk/9K6ANTYuqL7ePIPoJfU95ZXORzcYBHKm0=; b=gTI5CntTcfznrG6dmuSsXnxc4n1o4o6Fr5coSwA9r4jnyrg5eABEjDeuoGl/WnYNTeR1qMjOq yEuh3uRaIV7AGuLgca9Dj1nGSHWHNDrgcOqsP8fNvz3sX6wu8Eifm2E X-Mailer: b4 0.12.3 Message-ID: <20230809-net-netfilter-v2-5-5847d707ec0a@google.com> Subject: [PATCH v2 5/7] netfilter: nft_osf: 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=unavailable 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: 1773714061437519382 X-GMAIL-MSGID: 1773714061437519382 Use `strscpy_pad` over `strncpy` for NUL-terminated strings. We can also drop the + 1 from `NFT_OSF_MAXGENRELEN + 1` since `strscpy` will guarantee NUL-termination. Signed-off-by: Justin Stitt --- Note: Should this usage @8556bceb9c409 also be changed to `strscpy_pad` or is zero-padding not required here? --- net/netfilter/nft_osf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/netfilter/nft_osf.c b/net/netfilter/nft_osf.c index 70820c66b591..7f61506e5b44 100644 --- a/net/netfilter/nft_osf.c +++ b/net/netfilter/nft_osf.c @@ -23,7 +23,7 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs, struct nft_osf *priv = nft_expr_priv(expr); u32 *dest = ®s->data[priv->dreg]; struct sk_buff *skb = pkt->skb; - char os_match[NFT_OSF_MAXGENRELEN + 1]; + char os_match[NFT_OSF_MAXGENRELEN]; const struct tcphdr *tcp; struct nf_osf_data data; struct tcphdr _tcph; @@ -45,7 +45,7 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs, } if (!nf_osf_find(skb, nf_osf_fingers, priv->ttl, &data)) { - strncpy((char *)dest, "unknown", NFT_OSF_MAXGENRELEN); + strscpy_pad((char *)dest, "unknown", NFT_OSF_MAXGENRELEN); } else { if (priv->flags & NFT_OSF_F_VERSION) snprintf(os_match, NFT_OSF_MAXGENRELEN, "%s:%s", @@ -53,7 +53,7 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs, else strscpy(os_match, data.genre, NFT_OSF_MAXGENRELEN); - strncpy((char *)dest, os_match, NFT_OSF_MAXGENRELEN); + strscpy_pad((char *)dest, os_match, NFT_OSF_MAXGENRELEN); } } From patchwork Wed Aug 9 01:06:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 133024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2509171vqr; Tue, 8 Aug 2023 18:59:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGcr4f3cahfQ+hcA2eLyzZ0Hf3hpKM2CGo/oWc7Zn3amqh0avRXxh0T+hBWc77AA8lHVyxx X-Received: by 2002:aa7:c0d8:0:b0:522:3855:7ec5 with SMTP id j24-20020aa7c0d8000000b0052238557ec5mr1209996edp.10.1691546382001; Tue, 08 Aug 2023 18:59:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691546381; cv=none; d=google.com; s=arc-20160816; b=0CkzS6LBwXNrlpJqBvBQ9AbqCxVZALWoB9SWJ6QBk6t3S4X4JEirLXU8ewvGJrGD2b gDyq9wuvouG7W+fEJOfA2TQ/eNz/E8QNg50fylGrasznTLm+wsP2/OMoO8XaXe7NwZ16 wbtgT3PprPFF3Mto8lnW3WSExhlSCaUCTvwtDPIfQjV1pDYehZ+WFL/3H+tD5m2YKWd6 EkJAwqPR9gCpiORPx5h0rqLagSjaqHW1eobv1DDWvcFzGlbtjIIHdSWGOg3fWk+ci5G6 /pUKe5N7zd6QwiOPCR59Bqy8P+LZs+IK980H2/tXWy+9ItU29CEPgM6SycCViy6IGFHq MTpg== 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:references :mime-version:in-reply-to:date:dkim-signature; bh=b9SxK9VuBhH23JZNfwlmHxFJB2H3YTPscUMoMvn8rbc=; fh=XKPrIMXRcymmuVm42EqALpL6e4c/4tr+JJaDiplPt4I=; b=HRUG204ZLlFADqdkfQEbqrLHqJd9VP5fONwM6lL8YFG4bL5pPx+FSvtghsso3FTNRG 4IlApQ36ikgZE9vGuSk0Mms8gMLDNhEO2iEuxtQtdvkMlaDeXhnle4+xYHFCZdQDyu9G OKdiM+EZcaBKWdkwYBKX/WWKMiX9+/XQ+x+S0l2ZsmOGZBTwY5NyEoj6QjllJ4PmYxKP VYQFygXS4FjjX5o+F172Ch0gr0BXcuodm87ZC8XWzjyuoIuw9BXjXIhP1MGcPDOe46KU vqg1JDMza9YboqIEMy/or47X0VhQAu2fGx83S2YK5IGMtJHOJQ88mxh+kcTqHNfLnuIK cjIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=APutyrGH; 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 f12-20020a056402004c00b005231e5514ecsi7610706edu.689.2023.08.08.18.59.18; Tue, 08 Aug 2023 18:59:41 -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=APutyrGH; 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 S231514AbjHIBH5 (ORCPT + 99 others); Tue, 8 Aug 2023 21:07:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231465AbjHIBHr (ORCPT ); Tue, 8 Aug 2023 21:07:47 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AE2619BC for ; Tue, 8 Aug 2023 18:07:46 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d1c693a29a0so7360129276.1 for ; Tue, 08 Aug 2023 18:07:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691543265; x=1692148065; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=b9SxK9VuBhH23JZNfwlmHxFJB2H3YTPscUMoMvn8rbc=; b=APutyrGHq0YTWRW12pm4MFQuMqAXqr+kMsiQqH/8WklaM3Xjxt0HiR27YbGJXqvEjY 6eEjM3eABJspnPyTNt2jI/9l9gN7s6Apj1V2bXUTaQ9tTsvddYK9toOP4z76HqRLSZRt YGmlC9Xkgtbj7ra6sGK/3pWh9mFaoc2xFXx4337GwtDA5PKpGMb1+DX0ndI/f5JOPxAW HMPJIJzRPp5qesMCm+caWpzVA0W6/0vT9s9rwk6lxg1NsIvYmVYxdiqFK9rq1it2FYIe /pU54CocziwXtDHFJpS/JtamqtFWIYrqhcgDztGeQ4O9gGhnrH7m3upujJELrSf8X8L/ U8Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691543265; x=1692148065; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=b9SxK9VuBhH23JZNfwlmHxFJB2H3YTPscUMoMvn8rbc=; b=MAbtvtt0MrdWGN5Fs9rV3XiVqtl1Ya32z1pb2yV5M7iuSa4PT+3Ak47sDlxWpaCK9+ I84b00GJSyfsd5Hagj0EUQXgOiIr/9j+t6lG1ygM27pMtc7+Y1tnNlDsvY6X7NDNDUOX EFYK1Vj3RTyza+Lsbc9pp2iAvGJFKeFpqcUMQGlBxGWv65RtoUNj5B4uBGXFUfW+ZwjB hIMQFdliBe9P4sgNrOLmdv6xVmuXWWoypi/kNJSjRhEt0AcVBXCwRuS5b58U4MDqevVM Jn7LE+rUUW9UT/LJ0C5+DlaG06+MEpPCrjI6U33B64ifx45UU5r+evKjzy3QYNDCcZRf RdEw== X-Gm-Message-State: AOJu0Yzb79XHqD78dh04MPacPcYB1ozPvgYurrf7RVElM49X/tLH7zX9 9kJdRcF+S1dJ+5oBzc96cS5xQKHauVa/KnM5Mw== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:3288:0:b0:d44:585f:dfa8 with SMTP id y130-20020a253288000000b00d44585fdfa8mr25516yby.0.1691543265492; Tue, 08 Aug 2023 18:07:45 -0700 (PDT) Date: Wed, 09 Aug 2023 01:06:09 +0000 In-Reply-To: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> Mime-Version: 1.0 References: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1691543258; l=1226; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=MYwDvvyMzq/6Jbwjo4fUCw6xEkwFFEE6felLK1tQBvc=; b=WeXXNFVuxmL2/RZ5Dpc6W99h2eU2abWzCTXFBENisuaDRhmkxGJ3LkZOTBNdDDy6FyfR6PlS8 bEW3jArRu3JAcBUw2APr+XvWRQsMcU+uQodYXJbL14BITjI/xUBTb+t X-Mailer: b4 0.12.3 Message-ID: <20230809-net-netfilter-v2-6-5847d707ec0a@google.com> Subject: [PATCH v2 6/7] netfilter: x_tables: 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: 1773714939140829450 X-GMAIL-MSGID: 1773714939140829450 Prefer `strscpy_pad` to `strncpy`. Signed-off-by: Justin Stitt --- net/netfilter/x_tables.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index 470282cf3fae..21624d68314f 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -768,7 +768,7 @@ void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr, m->u.user.match_size = msize; strscpy(name, match->name, sizeof(name)); module_put(match->me); - strncpy(m->u.user.name, name, sizeof(m->u.user.name)); + strscpy_pad(m->u.user.name, name, sizeof(m->u.user.name)); *size += off; *dstptr += msize; @@ -1148,7 +1148,7 @@ void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr, t->u.user.target_size = tsize; strscpy(name, target->name, sizeof(name)); module_put(target->me); - strncpy(t->u.user.name, name, sizeof(t->u.user.name)); + strscpy_pad(t->u.user.name, name, sizeof(t->u.user.name)); *size += off; *dstptr += tsize; @@ -2014,4 +2014,3 @@ static void __exit xt_fini(void) module_init(xt_init); module_exit(xt_fini); - From patchwork Wed Aug 9 01:06:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 133030 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2516816vqr; Tue, 8 Aug 2023 19:21:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGWs1mV4rbslovfcnacbLMVuE4FXBcNeQSxS08RZN6Zdqa8JCx4kU1Ds2y8b885ghPg9nvL X-Received: by 2002:a17:902:ea02:b0:1b9:c03b:39d9 with SMTP id s2-20020a170902ea0200b001b9c03b39d9mr1702157plg.53.1691547703417; Tue, 08 Aug 2023 19:21:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691547703; cv=none; d=google.com; s=arc-20160816; b=jC+X2ToQsuU9ar4Y3IWRQnVEcF/5ZkeVEhWVHEGSUnI1TWZhcR5LVFFK3O5ZhlqIab +j5lMPnGISiH+SpbOxoqMmJgUMPd2n/ak8bD0hIJ8TGM2aYNFm73LnKUaRpGoAHMN4ia e8w2rlPGGt5B8vjYlqwvFMi28X6g+mLQm4FNGbxa1nLro9tLJvZJO4GdmVdfgTodl0Ct eHutnWBSrH1p7o+jjKVMGx7s7EZeVg44QpDFTkJN+Uz6Gl7etkxBdKmsmjWN2n/VW8J1 kRM6hS8AdaTA57QnVyBuXcPqbKcqLuRHEGHzUOxm1yHtYxO5inPRlxRSB6YjSdvEo1eW gVeg== 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:references :mime-version:in-reply-to:date:dkim-signature; bh=MG9K9YUhTMTzK19uCHNnSBLcKhcXx1YxnQhkeYxtQnQ=; fh=XKPrIMXRcymmuVm42EqALpL6e4c/4tr+JJaDiplPt4I=; b=g3v8hmKssAVKUPo5lAulkTrymbktpnpioEfMKfkxHO3XE0H2vYaXTmjnufYCrSq0ba sEhTuqmn6/TGkf7jhmNxuiR6yHoaWgNtSKoPkacmj+EuirJ9xG+4q1mP35Mqh9ZfbN8F 4Ax3oqFeoRIORPMAnPCV1SOd+64oQWEXGWohK1CnzQyvX4+351kB9AeUSJ+ROj48cynN 3QuVdxtTIhmwnQ8Hj3Xyhk3tEiORI3Igyik2XMHJdEuO4FluRWP97OSA+snVzuGRusY6 0aj33JlguBuhaomUBWcmUzne8cnITVZ2DVxTWB9MwBAm4YJnP0mAK4zzLgJBNzWYJXhJ OA3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=FLufdnQL; 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 ki6-20020a170903068600b001b3dd62b1dbsi8196822plb.560.2023.08.08.19.21.30; Tue, 08 Aug 2023 19:21:43 -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=FLufdnQL; 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 S231561AbjHIBIA (ORCPT + 99 others); Tue, 8 Aug 2023 21:08:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231497AbjHIBHx (ORCPT ); Tue, 8 Aug 2023 21:07:53 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CCC81BFA for ; Tue, 8 Aug 2023 18:07:47 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d4df4a2c5dcso4221510276.2 for ; Tue, 08 Aug 2023 18:07:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691543266; x=1692148066; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=MG9K9YUhTMTzK19uCHNnSBLcKhcXx1YxnQhkeYxtQnQ=; b=FLufdnQLID7CLFxDuinWTCHCNOM0tHWDzh/Q+ezwYBHvUhcKrvNRwf2X/858fNR7wb d8vbxPP43ceY/pyaj0Uw5PQ59JrcnSpcF/a3LfcIMqUOkY5p5Iam1144VCB1Ons2vj81 BmLiwO5IZchhdKNB3Hp+SHWii5wcBQkoVNE1bp5inoSeur+njvbFP1qGHTgPtXq1kfjg BEkjKbj13r7baEfK+6B3OTRz0y7Eybl5D1FWifL02RvN4LssSj5E1eUpHkMefprJM5KT H0ueJcMX3S8gV9suDKG8GXE43UgliTiV3eYQCRxb8WAldQnhoOh0RconuamFRyja+cUu eP6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691543266; x=1692148066; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MG9K9YUhTMTzK19uCHNnSBLcKhcXx1YxnQhkeYxtQnQ=; b=Mq7C7LGr+0pxaex/zppFXM1i2sKyyJ7LUYryy8rahwjw133IQLxujow8aHBodfJHub 1Uprvll09X1ihRJrpGEG3Zjkq5pfxvf+sYeWEIAqI8Np/K26BEhifKP/8Ap+bs1Q9f76 ccKq9kGk3D4EVD53OzqSIq4wX+0kyIpPLTEgUvvht0k7MXgui7tJos587LyX9/Wp0J0x asrgXIC+j61lVwLqWgq55PVVPD6e2XvAL/FKvvJ2T8wDxV1eqWZiAQFKH5sWUQZF4H5C cusXaUwziALdROt4EKIUZ34F3vx/F/2QiGyIf3IV9DfQBGTVyOw52qp18+KeA+UMF3zS qv3w== X-Gm-Message-State: AOJu0YwDM9vnY9ijH8qj44nAHNVQysrquqRfNot4TgJfni1+1dkDfSZY 42+ep2cr08AwOgNg97btJq4xsTJ8HXEyfyIMOg== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:ad26:0:b0:d58:6cea:84de with SMTP id y38-20020a25ad26000000b00d586cea84demr24517ybi.11.1691543266633; Tue, 08 Aug 2023 18:07:46 -0700 (PDT) Date: Wed, 09 Aug 2023 01:06:10 +0000 In-Reply-To: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> Mime-Version: 1.0 References: <20230809-net-netfilter-v2-0-5847d707ec0a@google.com> X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1691543258; l=1182; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=PvqWKqnPHt6FvPDmHzVp42icOwjac4OjqNFq/tqlT4Q=; b=sh9zj/YLC302K92KXYEsgv5KQ7slHtAn4AjmXQutkadONIDR1z3dS2tfhEUE1/fEjCLLxhXmz uQNQ/ErDWgqDBqL2ooZ4J+hnTeNjcylCNu2Z3wgVuRaaaBWLe9vWLDa X-Mailer: b4 0.12.3 Message-ID: <20230809-net-netfilter-v2-7-5847d707ec0a@google.com> Subject: [PATCH v2 7/7] netfilter: xtables: 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,URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=unavailable 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: 1773716324779299966 X-GMAIL-MSGID: 1773716324779299966 Prefer `strscpy_pad` as it's a more robust interface whilst maintaing zero-padding behavior. There may have existed a bug here due to both `tbl->repl.name` and `info->name` having a size of 32 as defined below: | #define XT_TABLE_MAXNAMELEN 32 This may lead to buffer overreads in some situations -- `strscpy` solves this by guaranteeing NUL-termination of the dest buffer. Signed-off-by: Justin Stitt --- Note: build tested only --- net/netfilter/xt_repldata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/xt_repldata.h b/net/netfilter/xt_repldata.h index 68ccbe50bb1e..5d1fb7018dba 100644 --- a/net/netfilter/xt_repldata.h +++ b/net/netfilter/xt_repldata.h @@ -29,7 +29,7 @@ if (tbl == NULL) \ return NULL; \ term = (struct type##_error *)&(((char *)tbl)[term_offset]); \ - strncpy(tbl->repl.name, info->name, sizeof(tbl->repl.name)); \ + strscpy_pad(tbl->repl.name, info->name, sizeof(tbl->repl.name)); \ *term = (struct type##_error)typ2##_ERROR_INIT; \ tbl->repl.valid_hooks = hook_mask; \ tbl->repl.num_entries = nhooks + 1; \