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