From patchwork Thu Apr 3 00:06:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 14036623 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 97DC4610B for ; Thu, 3 Apr 2025 00:08:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743638922; cv=none; b=mEWIcYQQXh0ZbxBY9r3aOB8O4roUcJfehQcGDibe8NyF/Emnde609K5iA6HvkCYg8UgZl5I6+0Yn6ZIaCApVataIhJLWIyGTrff8K4hJHcqZiAKCHgGF6d8t4LWtTc/SFzzuNu0y6Pi39NmNdmL/mqAOyaXp8Wi5GsV83s2mKhc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743638922; c=relaxed/simple; bh=A4qOF8g/Lp0fNN70XKVNtD9pF/sKUksq0VFQkLxYtOA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tP/6iyJQmYGI5BhO5Bgg3o2+sXpMU21x9BiL15PGhnOjh/IebFXynsaC0oIVSe8NUKfZPaKkLSIbOiKzURM5QQFHsBkzNdr/TPyXMSboePwTvsopqYyNvcHvy4ckcqLxlROiyBO42uW4LSWdlphFqI1gL/AD9E231m/fshBTpSc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--pcc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Eem3MP+g; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--pcc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Eem3MP+g" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2ff5296726fso480492a91.0 for ; Wed, 02 Apr 2025 17:08:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743638919; x=1744243719; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=mEgmoeCU7ZoBbD/6q07yzTwvuV9KDxvtvsClWJ9QuF8=; b=Eem3MP+g4EtVriA43tI3xztih2frs8m0SDRAT+ey1GJCq69R56WsoDNa7zniFZMVvy KTWeByMWvOGbbcc/exEJD6vt5bEyvx+8l0TyGdt9/q+2jT1wPzqbPFj7d2oRPAUHs3De gilDD7Lv+QRNJnXKCVQSV94JHof+SU2XzOUWNxrzRVOty4X7PvMGUgX4KrzQS7rmXfFj poBBJRSPDN/EaDlPEKUYbrUAkM7eWdtKhVyg8avnPA5PnkR4lTMGW2EAG6qfZQiRrk2f CTcTTbP4jlFTycgG+uT2L4x0msLPH39IbNqgV2YUK5MDiWochrxuJfxa7hDFFKBgT08Q urQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743638919; x=1744243719; 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=mEgmoeCU7ZoBbD/6q07yzTwvuV9KDxvtvsClWJ9QuF8=; b=ZiyZBWiFAZu6YMzEDcGdwhs9go2d8DlTY2x90mWjYX0qH7xn0nMu0L6eb+QigGjRsv JaExi4136Y/oWergoPWrvM+OdwkgLjt0ICRPbPQ6RcoRx79F7Q6Q1mVjBUrZ3MDZ49o2 KWYi8mUGNXkfEvkdHEpiclesSfA725OySU+/2I4uZstiKOBrUziw5lffgRsEownQl0mr 548EQrH0FAXNPWALNBjTixgLyzFX13RVklXtB736t1eQC9bOWBtC76VzMS0IwLdDGMsD FOAKn1XzlyTfrGe+VW+WfTcyjow0eavDbmNM4GIfOZnmaleIdLelyl7NORVsuWZW2FRV +LQA== X-Forwarded-Encrypted: i=1; AJvYcCWylNHhd2yc0begy3ny1G/DMZ/s3rm1J3RVnihIsnyWnPmFx6hqqblPvxg3NlLR1D19A9m3oKiPRFZbFrqz@vger.kernel.org X-Gm-Message-State: AOJu0Yx52SbacWOLELU/pzthrvNSyJkWiJ00IVpSuinkJA4p/eFbpdeb tga1tbrhGcxwJBjiVepJrw83V2VaveLZ/PTTfH6KAnXpjpoKugYxA8cdkVQPXJZM+A== X-Google-Smtp-Source: AGHT+IEn+KDt633hxPIy/Xv0o5YX2H1GlYC0LI3Wy6iiMYKkwRX/0697A1IGauH6w3mSOoDfNBnB/3U= X-Received: from pjbsu16.prod.google.com ([2002:a17:90b:5350:b0:2ea:9d23:79a0]) (user=pcc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5241:b0:2ff:58a4:9db5 with SMTP id 98e67ed59e1d1-3056ef46f92mr5028152a91.30.1743638918950; Wed, 02 Apr 2025 17:08:38 -0700 (PDT) Date: Wed, 2 Apr 2025 17:06:59 -0700 In-Reply-To: <20250403000703.2584581-1-pcc@google.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250403000703.2584581-1-pcc@google.com> X-Mailer: git-send-email 2.49.0.472.ge94155a9ec-goog Message-ID: <20250403000703.2584581-2-pcc@google.com> Subject: [PATCH v5 1/2] string: Add load_unaligned_zeropad() code path to sized_strscpy() From: Peter Collingbourne To: Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , Kees Cook , Andy Shevchenko , Andrey Konovalov , Catalin Marinas , Mark Rutland Cc: Peter Collingbourne , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, linux-arm-kernel@lists.infradead.org, stable@vger.kernel.org The call to read_word_at_a_time() in sized_strscpy() is problematic with MTE because it may trigger a tag check fault when reading across a tag granule (16 bytes) boundary. To make this code MTE compatible, let's start using load_unaligned_zeropad() on architectures where it is available (i.e. architectures that define CONFIG_DCACHE_WORD_ACCESS). Because load_unaligned_zeropad() takes care of page boundaries as well as tag granule boundaries, also disable the code preventing crossing page boundaries when using load_unaligned_zeropad(). Signed-off-by: Peter Collingbourne Link: https://linux-review.googlesource.com/id/If4b22e43b5a4ca49726b4bf98ada827fdf755548 Fixes: 94ab5b61ee16 ("kasan, arm64: enable CONFIG_KASAN_HW_TAGS") Cc: stable@vger.kernel.org Reviewed-by: Catalin Marinas --- v2: - new approach lib/string.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/string.c b/lib/string.c index eb4486ed40d25..b632c71df1a50 100644 --- a/lib/string.c +++ b/lib/string.c @@ -119,6 +119,7 @@ ssize_t sized_strscpy(char *dest, const char *src, size_t count) if (count == 0 || WARN_ON_ONCE(count > INT_MAX)) return -E2BIG; +#ifndef CONFIG_DCACHE_WORD_ACCESS #ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS /* * If src is unaligned, don't cross a page boundary, @@ -133,12 +134,14 @@ ssize_t sized_strscpy(char *dest, const char *src, size_t count) /* If src or dest is unaligned, don't do word-at-a-time. */ if (((long) dest | (long) src) & (sizeof(long) - 1)) max = 0; +#endif #endif /* - * read_word_at_a_time() below may read uninitialized bytes after the - * trailing zero and use them in comparisons. Disable this optimization - * under KMSAN to prevent false positive reports. + * load_unaligned_zeropad() or read_word_at_a_time() below may read + * uninitialized bytes after the trailing zero and use them in + * comparisons. Disable this optimization under KMSAN to prevent + * false positive reports. */ if (IS_ENABLED(CONFIG_KMSAN)) max = 0; @@ -146,7 +149,11 @@ ssize_t sized_strscpy(char *dest, const char *src, size_t count) while (max >= sizeof(unsigned long)) { unsigned long c, data; +#ifdef CONFIG_DCACHE_WORD_ACCESS + c = load_unaligned_zeropad(src+res); +#else c = read_word_at_a_time(src+res); +#endif if (has_zero(c, &data, &constants)) { data = prep_zero_mask(c, data, &constants); data = create_zero_mask(data); From patchwork Thu Apr 3 00:07:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 14036624 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6716EAE7 for ; Thu, 3 Apr 2025 00:08:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743638923; cv=none; b=fXsOvb5tmhBXTIWq+FEpE8Di/DXTQzUb10tzh6EtZD4Hw7hDmZeIwj8pCaC113b6datEWIxuH9MEtzSmLitpzHt5ylp5ZUHXk/PwMxFRo/oni4XocSHj35VzsuTk7BSE+A3TGj1AS8BAbr8ZeQBST2JAYc4vFqctFTWzJdwiktE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743638923; c=relaxed/simple; bh=SEXoMgfO871mcJmIm6KSXpbtvdsiD+EaJJqUWAfrQ38=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jSc5QTu6pPMC8AfbJh7wwbRFAq/E1LxLsv/vRk/sQnVhUy2o+F79uNwckyU9oNq1WPwKlqyUVA4KkTXH4r3frh4tm8yO104MZCr4BjJTXakv8ANQevKwITWgSmSGDC130CpU4a+BAstiE+WEhzXOjfa2E4ZpCkZ56ZlyG2b6+L8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--pcc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=r1RYD+5/; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--pcc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="r1RYD+5/" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3032f4eacd8so275599a91.3 for ; Wed, 02 Apr 2025 17:08:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743638921; x=1744243721; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NyoF5i3nxCUfNVJkAVl8GCLqKKAkd0DOEReeKsHnmjw=; b=r1RYD+5/EOTB26KkaCiqFXm/gJHwFDfSeWt8ZVgicOm249ixyGNyfZNLF/Sm4ZfjgL K/dP39BbVPOq0j+UtVdqeXyjvbk4edgV3QwLWD01iK1kcJv3MmGO8RgKMN+8nIVcHHbq 5RjsDecbyHK6aAfav4rWdnCKeOWGRGDqcTxKrNX82hCtxNjDGQcYEFCed1XjXrqXNSzh akZXSOlvlhIOIFig78Oh/uT5pp5D6pRpWai2ywbMTYNZJeT2qCT7TfZbmRhODR6kt1Df hWF+sZ8ETYjJ54sYlLMTa3IB6i6FB9VlVRWT4liAt/og60yUAu/1+sY+haZbl5nQSNiC SaiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743638921; x=1744243721; 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=NyoF5i3nxCUfNVJkAVl8GCLqKKAkd0DOEReeKsHnmjw=; b=K66UQ+bfvQreu92a8Capb86s1FSIudZKl2Ol0q8cIqv/KMWrl+UcxXHrwdml2HRFQh NWNvv4+sZrpisrk4QlxJB9WzscG6kY9zGNkXAwJiy88aJ4mXKZZ8sm7QaMqpw5YbTl/x 8apIVVHyEqa2u9vt4FhRcXbYUw/TD/OjT8pzERTz/Cynu+WYLXsMEebZQw43jCvEbpVt s4xHYq70jiYtLAJQWljII5ztqHETiD6JeqYSRaK22dCyHNBPT5pw6bcg0uTeSHtK2fvY ii9k/rERSgzlc2xkrDst6ilDuT8i/cal29KPD7aGhARFrI88T2ockcVak+SpJfI+tUvn JAng== X-Forwarded-Encrypted: i=1; AJvYcCX/jX8K6CijA48uG9HnRokQkJ/rHIcVW7iM/CjP9LIzXGwkXq2tcVBAD37ahpruxOrXpXQcoR0VYpCsXRXg@vger.kernel.org X-Gm-Message-State: AOJu0YzQj3BcWAchvaJQTkXSl90dG2uThourDrIbWG1x/Hne93gDeK0S cAJV1wPT1Dfsuxu16s/rHDmF9w6CnKBd6uuNYDdc9FTA8nstpjaX1VrdFsYhdCMoag== X-Google-Smtp-Source: AGHT+IF9PPSWYluV28LHjIAQYtoCIsrCyo2nNzgTlCfOaTtLczxhcR0/cQHFz16AjBy9tsQ09yZBi4s= X-Received: from pja11.prod.google.com ([2002:a17:90b:548b:b0:2fc:3022:36b8]) (user=pcc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:dfc7:b0:2ee:b875:6d30 with SMTP id 98e67ed59e1d1-30531fa4dd6mr27878978a91.9.1743638920951; Wed, 02 Apr 2025 17:08:40 -0700 (PDT) Date: Wed, 2 Apr 2025 17:07:00 -0700 In-Reply-To: <20250403000703.2584581-1-pcc@google.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250403000703.2584581-1-pcc@google.com> X-Mailer: git-send-email 2.49.0.472.ge94155a9ec-goog Message-ID: <20250403000703.2584581-3-pcc@google.com> Subject: [PATCH v5 2/2] kasan: Add strscpy() test to trigger tag fault on arm64 From: Peter Collingbourne To: Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , Kees Cook , Andy Shevchenko , Andrey Konovalov , Catalin Marinas , Mark Rutland Cc: Vincenzo Frascino , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Will Deacon , Peter Collingbourne From: Vincenzo Frascino When we invoke strscpy() with a maximum size of N bytes, it assumes that: - It can always read N bytes from the source. - It always write N bytes (zero-padded) to the destination. On aarch64 with Memory Tagging Extension enabled if we pass an N that is bigger then the source buffer, it would previously trigger an MTE fault. Implement a KASAN KUnit test that triggers the issue with the previous implementation of read_word_at_a_time() on aarch64 with MTE enabled. Cc: Will Deacon Signed-off-by: Vincenzo Frascino Signed-off-by: Catalin Marinas Co-developed-by: Peter Collingbourne Signed-off-by: Peter Collingbourne Reviewed-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/If88e396b9e7c058c1a4b5a252274120e77b1898a Reviewed-by: Catalin Marinas --- v5: - add test for unreadable first byte of strscpy() source v4: - clarify commit message - improve comment v3: - simplify test case v2: - rebased - fixed test failure mm/kasan/kasan_test_c.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/mm/kasan/kasan_test_c.c b/mm/kasan/kasan_test_c.c index 59d673400085f..e8d33af634b03 100644 --- a/mm/kasan/kasan_test_c.c +++ b/mm/kasan/kasan_test_c.c @@ -1570,6 +1570,7 @@ static void kasan_memcmp(struct kunit *test) static void kasan_strings(struct kunit *test) { char *ptr; + char *src; size_t size = 24; /* @@ -1581,6 +1582,25 @@ static void kasan_strings(struct kunit *test) ptr = kmalloc(size, GFP_KERNEL | __GFP_ZERO); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); + src = kmalloc(KASAN_GRANULE_SIZE, GFP_KERNEL | __GFP_ZERO); + strscpy(src, "f0cacc1a0000000", KASAN_GRANULE_SIZE); + + /* + * Make sure that strscpy() does not trigger KASAN if it overreads into + * poisoned memory. + * + * The expected size does not include the terminator '\0' + * so it is (KASAN_GRANULE_SIZE - 2) == + * KASAN_GRANULE_SIZE - ("initial removed character" + "\0"). + */ + KUNIT_EXPECT_EQ(test, KASAN_GRANULE_SIZE - 2, + strscpy(ptr, src + 1, KASAN_GRANULE_SIZE)); + + /* strscpy should fail if the first byte is unreadable. */ + KUNIT_EXPECT_KASAN_FAIL(test, strscpy(ptr, src + KASAN_GRANULE_SIZE, + KASAN_GRANULE_SIZE)); + + kfree(src); kfree(ptr); /*