From patchwork Fri Aug 11 21:19:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 134741 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1388624vqi; Fri, 11 Aug 2023 15:20:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHLilMeCOXL9fmEXGlz1UkPOSO6D9Zj0ftbUIkQLH6QN9m0O7N/2qfb9QjVqyz1n/pe2/e8 X-Received: by 2002:a05:6a21:7903:b0:13a:dbc1:16c0 with SMTP id bg3-20020a056a21790300b0013adbc116c0mr2968513pzc.32.1691792436067; Fri, 11 Aug 2023 15:20:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691792436; cv=none; d=google.com; s=arc-20160816; b=Sw2qm8pFCsx/wvDpAJVtzKYk0rhU+v/bP8bcWR5+Oo48KzT/BEP009veNxMFdfpro6 Q3XvLqrRM1ynPzkMFap8DFF0swiTt8MdWV5hmPoenn0hm/pSxlpklzLk1jfrXLBJQ6CL 3IOBIplGZnpuh0PXhq0PBQFvQmKSO92uLherN6oVk7tbawfC8XlXnIXAtA04kjlGDx7F GjRltBX64+n/vI8V8pbiiWA4MfYHxShBYeVcve9XVtqgNJ3Wj1nNQpKJVnKelR9P3Bpg durdUJ+Wttb7EgujbPR1Xc1QFp9vXgnlDYvW1VYOQtX+qLKBru3aopESaGdNS17pTL8o lH6w== 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=vokOFglu6CNVFlD6jFxpsLrBcNE5errPjKaL6LUnglg=; fh=JCPU5pmF5rAwjFhHLu3KoQR9dMjxzJUTO5pcc/zTQm0=; b=Tmba40tw8uVOLs8hQf4vn1v9CpPgpMc8bhkMmkN3xJtU65/XNA/yjhJR45ZqNyXZHP 4MOHfPAJTtt4n+Vl7MiSt1AWXfT4oBS/1OK59rxidOl2xrMyN6uto0EtXs8mfo4amk4T SOCWQBTAxP/4V+RTW5ZPqbqgZ8Q5hVjztVJf5Sbmzk7WFT6nVFIheko1IeBY/iX+2KBB N8KfZGAOWrmBXT1zoV/VviJ00puUGTeMuhaTI3n6dKQFfuGWjXAWYTL2rMvF+Q72euJF 7VVl7GZdz9jjjfyBwS6fJu3gxVW2XLjPtZu+pYh/Y6z84zjvm+iEo+QwrvgVrK/+MDe8 r8RA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=tOsdQnkR; 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 w68-20020a636247000000b0055c1760dd8esi4081814pgb.380.2023.08.11.15.20.20; Fri, 11 Aug 2023 15:20:36 -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=tOsdQnkR; 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 S236880AbjHKVTa (ORCPT + 99 others); Fri, 11 Aug 2023 17:19:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229503AbjHKVT1 (ORCPT ); Fri, 11 Aug 2023 17:19:27 -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 784542129 for ; Fri, 11 Aug 2023 14:19:27 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-56942667393so28358587b3.2 for ; Fri, 11 Aug 2023 14:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691788766; x=1692393566; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=vokOFglu6CNVFlD6jFxpsLrBcNE5errPjKaL6LUnglg=; b=tOsdQnkRdFPySXJ7aBEL+kY5112HthEEIawDywYABXxp9YXRYroZTrYNW87VUbeR6w gnfsPvSydIxNPCx/RPtTkwb6RerMKsEuJIyl7U/C3waNbaU7wr0JImPoka2YzlVj0Ih8 6pjOc1L9fBFcSIVBUDCD8S6uX7hs8crgEnCNZot4mKk3eGHefKgu8OYgILc1VkUwX0Wl H7pBqE0CQNiBloC4RhooFEGfnMWOFZzd60L6EAZXRDFhGV2IqF04UdrS/6MXav7kuvc8 66Sk1UukGjP11WxYjJFMcVJQXQF9NcICKPD23LYMz+JPCT1jjKnprYFqeweidJ1zEKsy tNTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691788766; x=1692393566; 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=vokOFglu6CNVFlD6jFxpsLrBcNE5errPjKaL6LUnglg=; b=KLfZY0y1wLY6IbA8RCrSoNdm75jiuWB2ujQVvMfg9UYG9qPxFE1iOxV+84Azt+QxAW Q/NUzxXCXK8bxmnrzho8t18vDY8BvGEVMXf7Bmr1zmoTJY2BS5IzIT2Pl9YRXKtHfSMx z68tYc/7KhCinxhAagzsRVyo/Zl8HSKxpER6/OzMSee5kL6KaSPZoCWvcvuCtBGelVMm dLsvWNzo1M+ps1QuSTWd1lkHC6T6WWHJd0CfK3j0jDYDXZUg/GB/bcO61CDxU3kyVs5J iYAXZMBw9dLrI9/QG6ocPxFkwnPJF+NhKk8hoTgRkZs31MDEP2S8saHv7CqEuSNq69oq F25Q== X-Gm-Message-State: AOJu0YygRBjpTKypA2yaoNgnnfst4LMg/2zF4UvrdhJlfagSpN74r+co FfjsmbmM2afUJHh9Pkx2sXZ5Vxg6k50j5Gl01A== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:dcc2:0:b0:d12:d6e4:a08f with SMTP id y185-20020a25dcc2000000b00d12d6e4a08fmr47833ybe.6.1691788766690; Fri, 11 Aug 2023 14:19:26 -0700 (PDT) Date: Fri, 11 Aug 2023 21:19:19 +0000 In-Reply-To: <20230811-strncpy-arch-powerpc-platforms-ps3-v1-0-301052a5663e@google.com> Mime-Version: 1.0 References: <20230811-strncpy-arch-powerpc-platforms-ps3-v1-0-301052a5663e@google.com> X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1691788764; l=878; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=rykhGlCJgq/28Gofw5R06xkjvMhLluFR9H0cPPJUQmM=; b=dqa+uC3ZSEDoM05puhWT3wolaXk7hfvs4+6yIWB8tO66gB9QZCYN9RSLwV2BvBVVbMLw1tvkc 4a2Vy7MXx8vCn44O2/F7Pbs8dDN7gJ5VA3oINrtf5Q66VN6jNZDUZnG X-Mailer: b4 0.12.3 Message-ID: <20230811-strncpy-arch-powerpc-platforms-ps3-v1-1-301052a5663e@google.com> Subject: [PATCH RFC 1/3] powerpc/ps3: refactor strncpy usage attempt 1 From: Justin Stitt To: Geoff Levand , Michael Ellerman , Nicholas Piggin , Christophe Leroy Cc: linux-hardening@vger.kernel.org, Kees Cook , Nick Desaulniers , Nathan Chancellor , linuxppc-dev@lists.ozlabs.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, RCVD_IN_DNSWL_BLOCKED,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: 1773972945388798023 X-GMAIL-MSGID: 1773972945388798023 This approach simply replicates the implementation of `make_field` which means we drop `strncpy` for `memcpy`. Signed-off-by: Justin Stitt --- arch/powerpc/platforms/ps3/repository.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c index 205763061a2d..1abe33fbe529 100644 --- a/arch/powerpc/platforms/ps3/repository.c +++ b/arch/powerpc/platforms/ps3/repository.c @@ -73,9 +73,9 @@ static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4, static u64 make_first_field(const char *text, u64 index) { - u64 n; + u64 n = 0; - strncpy((char *)&n, text, 8); + memcpy((char *)&n, text, strnlen(text, sizeof(n))); return PS3_VENDOR_ID_NONE + (n >> 32) + index; }