From patchwork Fri Aug 11 21:19:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 134722 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1370130vqi; Fri, 11 Aug 2023 14:39:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGXj19bAPYyKYppU0H1nxLFpt6OSQEMjvBG/oqEoHGDHt8Q+J+yZwTUBU3TUp8Ukmt9qIDl X-Received: by 2002:a05:6402:1844:b0:522:b876:9ef5 with SMTP id v4-20020a056402184400b00522b8769ef5mr3497074edy.8.1691789949933; Fri, 11 Aug 2023 14:39:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691789949; cv=none; d=google.com; s=arc-20160816; b=jGfQhsPKAor1j0T6FqSiAZAwyPxVvgdGqfcRB1ZDbSS5tjVJLTt0hrEesljpeqvr1V 1HXga3u7IW2I0saqRU4pixvxW01lPxD7wVYNLsEsS1sv2ZmwhbAVN/HJZhezDJcWX8/n LLvp4bsFz+lgixuSYETX2H8zV5J8Fv9LVUfV+hZVtI+kvFsWJC334+UVjhYcTBufqmAD UkNr7tlErwRGOquiB2D9GPxmvI0ITE5FLHJwPrJ78gZDkYvIyt8tmApIBHT+tmDD4M5l vWWhfDGY/1dt/ZyJP3Gd0zaZCRMb//fMFu1y7e/gYHi0FJh0S9Vg+YWq1bEbyknl4kuy X7uQ== 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=JiHGiTVfdz5CucudaZHkceNNqnAp127R9oXTgpxLmS0=; fh=JCPU5pmF5rAwjFhHLu3KoQR9dMjxzJUTO5pcc/zTQm0=; b=UxVIwXiJJnd8r3/uFXESqVlXe8DcM+yamDBuDxHfZEk5j3KhsfZ7iRHfgEvYvZ4GYf AbCbOxL6kRHcJMzwt+ggI7iSTIHry7x0aPD19HcVcW0EUZhaY6l7jmdbfdFQoukEUjMm TeOFLcsIqwwtoGRAvoKQyBTpapl+exf3i7XZK7Nj5G0eVO80XvNWeEfW6bZfwX+lnT+5 Ivq9QObcoIekgYNeJZaK9zTTN2+f994pgSKCuh3A9ev89wfKvxFwBYYrJKxPPIIOroEW hE9OSB4c/i3wdEbT9jhgy5/AV8MYFQUw+UTNYnIjYg6Lz5XzoEwMzXFqtGwZj63glSH+ qAbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="69/W2KdB"; 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 z24-20020aa7cf98000000b005234f30c399si3965290edx.127.2023.08.11.14.38.46; Fri, 11 Aug 2023 14:39:09 -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="69/W2KdB"; 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 S236902AbjHKVTf (ORCPT + 99 others); Fri, 11 Aug 2023 17:19:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236876AbjHKVTa (ORCPT ); Fri, 11 Aug 2023 17:19:30 -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 C00E3171F for ; Fri, 11 Aug 2023 14:19:29 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5896bdb0b18so45335767b3.1 for ; Fri, 11 Aug 2023 14:19:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691788769; x=1692393569; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=JiHGiTVfdz5CucudaZHkceNNqnAp127R9oXTgpxLmS0=; b=69/W2KdBUbTfVSLt7H2R1qqS3DXKFqFlWpbGW7Cg3ECEi8vGGHJaho4vRdFup3fEeV zVcU2qUDoBdNFmSOCqTHHDQHKg2IrdYm39Vt5gS5rz94OnIR7DEtN2lsAVmSb0Tqz0Ht Z5l8peAOiEHZtJ2Gklp82OPAuiBTHojD7Pg5Q7iZZcREV+yEUuxSLNG0n8waPGLDRreo a+NcGUKV8kMK8j8cMqGepg+/OizzIBECrGyezlwSfbYn9niSi09jOGbJhiGnOPkuEtJ8 YU/x8cXvc9erPDbri9oiyV6O0REpsuYGmemCP2W4ouJtR3u/tP7DEk/xn+Z9gKF0xqOQ LNpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691788769; x=1692393569; 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=JiHGiTVfdz5CucudaZHkceNNqnAp127R9oXTgpxLmS0=; b=bjGgei3444bssS41ps53yR8h4fyquKcgFM2x+DlLEje/UXM//Qnhrw0wNUIxJXd7Bd 2h3Z1CROxvOR2awgdL3lvUxeCUhhfZucNbh++rtlO6L91PAUvuftUXvLj6w+dYJiCoZr Hekv4cxEQdrK65hqhW+nhpyYrL0nJ/RR+S0tCPlMkGHeM7JP1sc40aOoxzt+vZlUX5Vk UP4zFEyxZyD46VmS/o/kp3fTdl+IaQvUX4jY54AZAuLRgLjk7DeQ5r/x2WN2cm6m3Bd4 bcT0XeCtwRoOMvW0+zTHwnesCd+dh+VloQyWin6t8cxyDt0y8DbhmxKLs8Vn4OUnS4Vb pW5Q== X-Gm-Message-State: AOJu0Yw5k+4ZQwiRy9yLaGl6F3UvgmoaWkQWzr3j4w7gKPfXsX8XnpFk Jo2JB0GtZp4O+rywX3Zm0knbrXCNIBl+ddrrjg== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a81:af49:0:b0:589:a610:aef with SMTP id x9-20020a81af49000000b00589a6100aefmr76862ywj.2.1691788769080; Fri, 11 Aug 2023 14:19:29 -0700 (PDT) Date: Fri, 11 Aug 2023 21:19:21 +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=2360; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=un5KrhEbUeSG5MIia1JYWEm7kQ5KlO4dof2rfH0SxB0=; b=3nGjJYu+m7uWyObArsWKunAcpSZnHjKe9mn5gkmY/yM21roqfaVuczXVmSVp0u0rKkq9+vbWf LjstrWwCo1OAJQJrgXlXQxNm1g4I4F9O5JB8O/Ope1+HZNTSmJBVJ/g X-Mailer: b4 0.12.3 Message-ID: <20230811-strncpy-arch-powerpc-platforms-ps3-v1-3-301052a5663e@google.com> Subject: [PATCH RFC 3/3] powerpc/ps3: refactor strncpy usage attempt 2.5 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: 1773970338120895528 X-GMAIL-MSGID: 1773970338120895528 Forward declare `make_field` for a cleaner diff Signed-off-by: Justin Stitt --- arch/powerpc/platforms/ps3/repository.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c index 6b731a5d4adc..6a08bb7704da 100644 --- a/arch/powerpc/platforms/ps3/repository.c +++ b/arch/powerpc/platforms/ps3/repository.c @@ -20,6 +20,8 @@ enum ps3_lpar_id { PS3_LPAR_ID_PME = 1, }; +static u64 make_field(const char *text, u64 index); + #define dump_field(_a, _b) _dump_field(_a, _b, __func__, __LINE__) static void _dump_field(const char *hdr, u64 n, const char *func, int line) { @@ -63,33 +65,33 @@ static void _dump_node(unsigned int lpar_id, u64 n1, u64 n2, u64 n3, u64 n4, } /** - * make_field - Make subsequent fields of a repository node name. - * @text: Text portion of the field. Use "" for 'don't care'. + * make_first_field - Make the first field of a repository node name. + * @text: Text portion of the field. * @index: Numeric index portion of the field. Use zero for 'don't care'. * + * This routine sets the vendor id to zero (non-vendor specific). * Returns field value. */ -static u64 make_field(const char *text, u64 index) +static u64 make_first_field(const char *text, u64 index) { - u64 n = 0; - - memcpy((char *)&n, text, strnlen(text, sizeof(n))); - return n + index; + return PS3_VENDOR_ID_NONE + ((make_field(text, index) - index) >> 32) + index; } /** - * make_first_field - Make the first field of a repository node name. - * @text: Text portion of the field. + * make_field - Make subsequent fields of a repository node name. + * @text: Text portion of the field. Use "" for 'don't care'. * @index: Numeric index portion of the field. Use zero for 'don't care'. * - * This routine sets the vendor id to zero (non-vendor specific). * Returns field value. */ -static u64 make_first_field(const char *text, u64 index) +static u64 make_field(const char *text, u64 index) { - return PS3_VENDOR_ID_NONE + ((make_field(text, index) - index) >> 32) + index; + u64 n = 0; + + memcpy((char *)&n, text, strnlen(text, sizeof(n))); + return n + index; } /**