From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5892AC71145 for ; Wed, 23 Aug 2023 23:00:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238755AbjHWXA2 (ORCPT ); Wed, 23 Aug 2023 19:00:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238615AbjHWXAS (ORCPT ); Wed, 23 Aug 2023 19:00:18 -0400 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F604E7D for ; Wed, 23 Aug 2023 16:00:16 -0700 (PDT) Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1bf7a6509deso26066455ad.3 for ; Wed, 23 Aug 2023 16:00:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1692831616; x=1693436416; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=qLCjiWqrer6h5u4yI8Dn0Or6ThhoDKnShaXJx7/pdGE=; b=UBZbuy8xVhmnRBWeBVoKov76R5VoBWk1szD0y0BxtODZXChyrNnbdhbPfNss7yGvHB Ai2jOJw24v7GYVS7EosaI04ttXJ9Ux/xC2X3bX7aw+iLMkuLnwDSHpfTEBw7IJNGgB21 R6OM6JD3BgcW8+ChbJj3YPLORRqMAFTZuhQbk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692831616; x=1693436416; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qLCjiWqrer6h5u4yI8Dn0Or6ThhoDKnShaXJx7/pdGE=; b=ic/jIWUSMvZzP2q46m7aJyx5R9w1z7li3ZNlgRbeMjktGy90VCuqHeIgfFBSwU+b+M 0euvB3UXetgNXigExcFQyvTXT2HNYCR14CSdMUJOFNZz7Dp7gZhTiv4nrJbhNjYUu5/y mhyccZnx7RzEFIz6oghLT+u+WY7wp43uJo4Ury3nkhOVTMK0mGEqMiDCjwZXuLOhx0Lf FXy0zPfjPjbzzKOfu44UWBq2EF83UjJR1bW/YBUOQctdgqqZxlymT7+A8FlJW2mwwPyB zt0hMuOXGLyTGeozQXUbgRp5j+gchF0MGDTreOaW4B3wiXYpJHSRnV20gE6st2o0Nd+G gnJA== X-Gm-Message-State: AOJu0YyvVxKhKaDJnjov/vHW/651LKRscg2C53/z3r4cefmIoTyXtGAL I0BVkjr6bzLr66GtNiiAqFxmoA== X-Google-Smtp-Source: AGHT+IFcZLZc30xTImLvbb8bl+52iDkfKxeYad4KzUtWrIA+9bEUNamHUEuGPdJDEkAbRzoSqG3zWQ== X-Received: by 2002:a17:902:70cc:b0:1bc:9c70:b955 with SMTP id l12-20020a17090270cc00b001bc9c70b955mr11401623plt.28.1692831615671; Wed, 23 Aug 2023 16:00:15 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id o4-20020a170902bcc400b001b88da737c6sm11439844pls.54.2023.08.23.16.00.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 16:00:14 -0700 (PDT) Date: Wed, 23 Aug 2023 16:00:13 -0700 From: Kees Cook To: Justin Stitt Cc: Andy Shevchenko , Steve Wahl , Mike Travis , Dimitri Sivanich , Russ Anderson , Darren Hart , Andy Shevchenko , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH] x86/platform/uv: refactor deprecated strcpy and strncpy Message-ID: <202308231554.4873EE731@keescook> References: <20230822-strncpy-arch-x86-platform-uv-uv_nmi-v1-1-931f2943de0d@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-hardening@vger.kernel.org On Wed, Aug 23, 2023 at 03:49:34PM -0700, Justin Stitt wrote: > On Wed, Aug 23, 2023 at 4:07 AM Andy Shevchenko > wrote: > > > > On Wed, Aug 23, 2023 at 1:32 AM Justin Stitt wrote: > > > > > > Both `strncpy` and `strcpy` are deprecated for use on NUL-terminated > > > destination strings [1]. > > > > > > A suitable replacement is `strscpy` [2] due to the fact that it > > > guarantees NUL-termination on its destination buffer argument which is > > > _not_ the case for `strncpy` or `strcpy`! > > > > > > In this case, we can drop both the forced NUL-termination and the `... -1` from: > > > | strncpy(arg, val, ACTION_LEN - 1); > > > as `strscpy` implicitly has this behavior. > > > > ... > > > > > char arg[ACTION_LEN], *p; > > > > > > /* (remove possible '\n') */ > > > - strncpy(arg, val, ACTION_LEN - 1); > > > - arg[ACTION_LEN - 1] = '\0'; > > > + strscpy(arg, val, ACTION_LEN); > > > p = strchr(arg, '\n'); > > > if (p) > > > *p = '\0'; > > > > https://lore.kernel.org/all/202212091545310085328@zte.com.cn/ > > > > ... > > > > > + strscpy(uv_nmi_action, arg, strlen(uv_nmi_action)); > > > > strlen() on the destination?! > > > > ... > > > > > - strncpy(uv_nmi_action, "dump", strlen(uv_nmi_action)); > > > + strscpy(uv_nmi_action, "dump", strlen(uv_nmi_action)); > > > > Again, this is weird. > > This is a common pattern with `strxcpy` and `sizeof` if you `$ rg > "strncpy\(.*sizeof"`. Do you recommend I switch the strlen(dest) to > strlen(src)? I only kept as-is because that's what was there > originally and I assumed some greater purpose of it. It's best to avoid any assumptions. If it can't be answered through code inspection, the next best thing would be to ask for clarification. In looking I see uv_nmi_action is a string: arch/x86/platform/uv/uv_nmi.c:193:typedef char action_t[ACTION_LEN]; arch/x86/platform/uv/uv_nmi.c: strcpy(uv_nmi_action, arg); arch/x86/platform/uv/uv_nmi.c:module_param_named(action, uv_nmi_action, action, 0644); arch/x86/platform/uv/uv_nmi.c: return (strncmp(uv_nmi_action, action, strlen(action)) == 0); arch/x86/platform/uv/uv_nmi.c: strncpy(uv_nmi_action, "dump", strlen(uv_nmi_action)); using strlen() here seems "accidentally safe", as it's overwriting "kdump": if (uv_nmi_action_is("kdump")) { uv_nmi_kdump(cpu, master, regs); /* Unexpected return, revert action to "dump" */ if (master) strncpy(uv_nmi_action, "dump", strlen(uv_nmi_action)); anyway, a simple "sizeof" should be used AFAICT. -- Kees Cook