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