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);