From patchwork Wed Aug 9 18:19:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 133425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp3013515vqr; Wed, 9 Aug 2023 12:06:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHncdrllOoShBFz//JqEYVuIt3lAcXt3wThFg3jnAAgVXi0RE4lb75iu9vwqLeZWlUspJve X-Received: by 2002:a17:907:b1b:b0:94e:4489:f24d with SMTP id h27-20020a1709070b1b00b0094e4489f24dmr2825202ejl.61.1691607995102; Wed, 09 Aug 2023 12:06:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691607995; cv=none; d=google.com; s=arc-20160816; b=u99X8hWy19T7AejRk/7BnSIuqnwna5gkdA8p8+0v5eWC63sKnWL22iiUQX3+V1wZiq DBHIAxzGBvwiqJka3Hv3+1DQe1Ewjc5b6RyTF5hYmettG9QhNobaRvKJym7Ru+nwEJsc 4ZJwAaRcifZ+oFoXxmwswoV9PgTXDYDVuURyjR7U5z+aIJr7S0Hb8CpgE3hKTRu1R8Ih 0o15omGvYctsfVvwjQPkABo2UvGySUTMG3lX+ZMOWnZyzGEYCWONXOSgAeIuC/wUlSr7 v6ceqWy5NH6oFqpGGFT2uctWfgXg5zwqmJquQzfB3OP3WoJ540qkF5RLw6VF3/dZzJvw 96lA== 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:mime-version:date :dkim-signature; bh=r9+IWZmGOXJH6TQW7TrBTS32AvWqt6FCCDY8aKxFBjc=; fh=5CjBLHHLBpRUG43U/juo4qKf9zk9/H/LW2OLn0k0Pbk=; b=xioJtKaPMlWmVy6pyU1qxgfYGV5bnaQDVfXmx+U3pMmjcXRQh/nzSyRcJ98G7JR7uN r2MJvyAEES7iYVM2GC/7IOaBGMt58V8rAdGj1vd1VsmlQuxKKZJQn6NlAklb2GbAERQv 6BL43CTv2H7QX706vqXj/JQ1a2uAcR0b9TB/wvb8BCm6xaU2o3QL4qdowPaP3EqR9sv7 +KKpJNgS/H2L9hcFljrDnr2PFlCiEEGHUosYkTDe6eEcLvzrcccW+gCmepoet5KalrDP wnvuQ6OW2rvhBd3cMkqKZcDrBkCulIpaWfH7LnB75Iyt2UGeb/jHdcoM5XdofRQXBUbC LlYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=RH6NAR3H; 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 t22-20020a170906269600b00997b9cfd270si9359228ejc.419.2023.08.09.12.06.10; Wed, 09 Aug 2023 12:06:35 -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=RH6NAR3H; 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 S229790AbjHISTn (ORCPT + 99 others); Wed, 9 Aug 2023 14:19:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229489AbjHISTk (ORCPT ); Wed, 9 Aug 2023 14:19:40 -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 CCA181BCF for ; Wed, 9 Aug 2023 11:19:38 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5896bdb0b18so1401657b3.1 for ; Wed, 09 Aug 2023 11:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691605178; x=1692209978; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=r9+IWZmGOXJH6TQW7TrBTS32AvWqt6FCCDY8aKxFBjc=; b=RH6NAR3HPdnAujcthLTNkfqMgMO/gZFXu3pAy247EtYZv7AEyeT6rW7a3dF7bt4t1K Ns5gMTpuaZ0NzSKHwUP9D7wle6yt6iTpcCM8L0rXvYhcYC5qEocjnXhwI5qb4Aj+iJWl j526OvzmzAb83YAkRWDy3Av3Fjt7vzl0O1W+Id2YO/7AUktjkzoS6ThAMaOvvFAFArSz xbQ+kkaEGA49j8RS/1N2dEIzJ9m1nBTYKNo+S0/WE5oIbaCSG3iSPyI/q/H38rPT0hjF l/iS9ZIzREp9evcoCEAAlfNbISIIW6lKjFv+SAEYcAEpNfWoZ6TMyo6HwgV/MKdhqR9z vjIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691605178; x=1692209978; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=r9+IWZmGOXJH6TQW7TrBTS32AvWqt6FCCDY8aKxFBjc=; b=h8zgz8nXTy5Ym3W6j+llHknJ8HP0XXf+dt0PrHexqSYMHDchiRv7aFtgBC7Acddbo8 kPxHKeuF+5nBEDyaAQeqjvyYoHzjgNoTsMro8RLp8hEq3r/ihorOZ6mviH5SzNQkKo6R JYYu7cU0DEoyGZJQi6M4l9UEoamegIA/p4mvCtbK2gsKqKXDEHRmQMN+RfJcq//TvF3e lnrh1IFtJ4Pm7TKt6BlKBZnJyfzVgJILsrSAab39JCSUXhh0d3gnkIvC6kO/sNoxXkCe I85jw5w2LsAnaE1CRY0rZ9P1iQvXiSmkvD1NgtmzuOrUcxBy3kW2PvPp99bY6pdg/gHF Sncg== X-Gm-Message-State: AOJu0YyU+GnIUY8NkTXO1OjzT27PguYJno2V+OUDIqmalGYLTriwqadh BxZuYJzRxc7ybgsty/b/ETpnuYA9gf/YuNOv+w== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:690c:70a:b0:586:e2b5:f364 with SMTP id bs10-20020a05690c070a00b00586e2b5f364mr4614ywb.4.1691605178129; Wed, 09 Aug 2023 11:19:38 -0700 (PDT) Date: Wed, 09 Aug 2023 18:19:32 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIALPY02QC/2WMyw6CMBQFf4XctTV9AC2u/A/jgpZbaCKUtNpoC P9uYaPG5ZycmQUiBocRTsUCAZOLzk8ZxKEAM7RTj8R1mYFTLqiikrTBDOQxEoGWlyUTJZcI+T0 HtO65ly7XzIOLdx9eezixbf1vJEYYUXWntdVVI2lz7r3vb3g0foQtkvi3qD4iz2JlNcoaW6sq8 SOu6/oGENOyE9gAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1691605177; l=2213; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=23IC5Bw+8KkKs09S0EaJWss3x1p4d4hD+7BkZ/ap4cg=; b=gfF6LynUr5OZNkVjBs6fVzSf9HY8BE2EsZGdMISI5wxTkkPFSBAPa8s8UwSGy9Awn7YZsIbB+ XjEWts8XjrNAywzyWQ+e03kVuL94vwtZkqCoKKelbu2jA/dn9CwrB1e X-Mailer: b4 0.12.3 Message-ID: <20230809-arch-um-v3-1-f63e1122d77e@google.com> Subject: [PATCH v3] um: refactor deprecated strncpy to memcpy From: Justin Stitt To: Richard Weinberger , Anton Ivanov , Johannes Berg Cc: linux-hardening@vger.kernel.org, linux-um@lists.infradead.org, linux-kernel@vger.kernel.org, Kees Cook , 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: 1773779544899921036 X-GMAIL-MSGID: 1773779544899921036 Use `memcpy` since `console_buf` is not expected to be NUL-terminated and it more accurately describes what is happening with the buffers `console_buf` and `string` as per Kees' analysis [1]. Also mark char buffer as `__nonstring` as per Kees' suggestion [2]. This change now makes it more clear what this code does and that `console_buf` is not expected to be NUL-terminated. Link: https://lore.kernel.org/all/202308081708.D5ADC80F@keescook/ [1] Link: https://github.com/KSPP/linux/issues/90 [2] Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings Cc: linux-hardening@vger.kernel.org Suggested-by: Kees Cook Signed-off-by: Justin Stitt Reviewed-by: Kees Cook --- Changes in v3: - Swap `strtomem` to `memcpy` (thanks Kees) - Link to v2: https://lore.kernel.org/r/20230808-arch-um-v2-1-5fbe76eaf853@google.com Changes in v2: - Keep usage of ARRAY_SIZE (thanks Bill) - Remove unnecessary import (thanks Kees and Bill) - Link to v1: https://lore.kernel.org/r/20230807-arch-um-v1-1-86dbbfb59709@google.com --- Notes: I only build tested this patch. --- arch/um/drivers/mconsole_kern.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- base-commit: c1a515d3c0270628df8ae5f5118ba859b85464a2 change-id: 20230807-arch-um-3ef24413427e Best regards, -- Justin Stitt diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 5026e7b9adfe..ff4bda95b9c7 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c @@ -554,7 +554,7 @@ struct mconsole_output { static DEFINE_SPINLOCK(client_lock); static LIST_HEAD(clients); -static char console_buf[MCONSOLE_MAX_DATA]; +static char console_buf[MCONSOLE_MAX_DATA] __nonstring; static void console_write(struct console *console, const char *string, unsigned int len) @@ -567,7 +567,7 @@ static void console_write(struct console *console, const char *string, while (len > 0) { n = min((size_t) len, ARRAY_SIZE(console_buf)); - strncpy(console_buf, string, n); + memcpy(console_buf, string, n); string += n; len -= n;