From nobody Tue Dec 16 18:12:06 2025 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 7C89213632B for ; Tue, 25 Mar 2025 01:56:24 +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=1742867785; cv=none; b=HMYedxRhNGmri9y5Ek96d7lswMXAlEkhjfJ+UAeDeiwwEqcLdUkpwQGqKkh/fnkFUdBm5TD/HhhzjMSl3ABQln0Mo824P2fGJazOBRYSzqvZaOShHr8+V9LZXQI3fzaevxkDCxZcJg/jGJrnYf8iEia09yZS+HBpLjhw0dK1dYQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742867785; c=relaxed/simple; bh=48tNNYVxNbJIhapHHVTjKQnmA5ByjfhX/glfPRAKIhc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=d20iNE2DXEH8bOjry7YSxP/v+fJtiHtWf+JaQjZ6bvpKvw2Ur40WWD/mDK7oLpLtlgl5c3Z5xh2m18013eCFamF5FrEp6m1/kdUaj71DtIw04nZ1006khQFyVSAadZAxW8EWxNYauZ7N5yBbJG3aRmDuX0OadhErYaNPpQ4gOy4= 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=FkjewmG+; 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="FkjewmG+" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3032f4eca83so3810247a91.3 for ; Mon, 24 Mar 2025 18:56:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742867784; x=1743472584; 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=eTUn5qDH83alwoR8172wGnmaTD/nkQcDeotToQ/FQtU=; b=FkjewmG+FV+EP/1KOy41Zni1Cd5leqp1EcL7phKYW7cpCLzn++Zs/1mKxv6n5tipbN v6dldqrqUyTQ4n+7PVcr7ZTSnPCA38OJWYhB0kcH9grWUqi1AFYcJ/Kvvrv0JGosqNRD U1ezVSKfhrrIJ1G05C5QOck61+fy+ZbPZ0vSEwlSIbkG7RvHdGHmBGBEScKIyQeoAc4l Pofpt8FV4VBQPXA8Cmk+wsX17H1XKjhZCGYD+o0CvkIjrzvlHm2dB9bOEqBMVq9Sf30M 6ARjGhcT6puXgBDjmL6spc0Apu15+90hynW8e973xxVIczDWlACRW8SLAFecjQO8WO9N vnkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742867784; x=1743472584; 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=eTUn5qDH83alwoR8172wGnmaTD/nkQcDeotToQ/FQtU=; b=lAiDnn+Xi/EGAMNaYO/3HvQf01CAH2mbg3UsONQvXRgZVmBaLXPwuWPUc5LkQzWoPz /ZlHpUiSx4MFBrVVQpmzrEDL0tBW/0JSfQX3mCP2HR0kIjwlMO094lrZ6k7qKA1CvNJv OquG9SveVWlmPHWxcL2ZdZ1Q1ZjVfzojwgAsBU8iPAjV+pI1+wSEBnL3cfJ6Fk+B3nMl YZYnfwJk7vxMTri1F5hOjcq4GVSGWuecj1E3ccuZP+GnS+0eC0JKDHB5ENFrDFyjdNNf jT4K+c8C6EVThxn4bZEcdV76TUP8Pcs2jn3Ev8wCcurp5UGkx4d22O1fQ8fqRhIw1OeG N+cQ== X-Forwarded-Encrypted: i=1; AJvYcCXX5Tk4fjDMpxRlUMiB3NUM5aZ7OPQ4MsuixF40lQzwFaWGpABcrsJANMJ/7mJ3A73KNC1d7FZ27CVzBLM=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/WRclbOiW8/Qpv6fDNjQCGRYCfozKWfkF2MZiosZKxOVM6DHr WHo1jsXmpri+dWgdiCLaFBgdN7u3dm5APO93M2SVRKI+JTL/1yO0ueBzazY9Y8Va+Q== X-Google-Smtp-Source: AGHT+IFIvVndmJ5T1LC0v2mYgG4gIWIkXYdD4jSAqc98z2o614eIuEt5Jeeq109zoC0i0zwJ2WUV6dM= X-Received: from pgrx8.prod.google.com ([2002:a65:4548:0:b0:af2:734a:2cfb]) (user=pcc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:788b:b0:1f5:8179:4f47 with SMTP id adf61e73a8af0-1fe42f557edmr27545583637.20.1742867783666; Mon, 24 Mar 2025 18:56:23 -0700 (PDT) Date: Mon, 24 Mar 2025 18:56:14 -0700 In-Reply-To: <20250325015617.23455-1-pcc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250325015617.23455-1-pcc@google.com> X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog Message-ID: <20250325015617.23455-2-pcc@google.com> Subject: [PATCH v3 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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/If4b22e43b5a4ca49726b4bf98ad= a827fdf755548 Fixes: 94ab5b61ee16 ("kasan, arm64: enable CONFIG_KASAN_HW_TAGS") Cc: stable@vger.kernel.org --- 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 =3D=3D 0 || WARN_ON_ONCE(count > INT_MAX)) return -E2BIG; =20 +#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, si= ze_t count) /* If src or dest is unaligned, don't do word-at-a-time. */ if (((long) dest | (long) src) & (sizeof(long) - 1)) max =3D 0; +#endif #endif =20 /* - * 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 =3D 0; @@ -146,7 +149,11 @@ ssize_t sized_strscpy(char *dest, const char *src, siz= e_t count) while (max >=3D sizeof(unsigned long)) { unsigned long c, data; =20 +#ifdef CONFIG_DCACHE_WORD_ACCESS + c =3D load_unaligned_zeropad(src+res); +#else c =3D read_word_at_a_time(src+res); +#endif if (has_zero(c, &data, &constants)) { data =3D prep_zero_mask(c, data, &constants); data =3D create_zero_mask(data); --=20 2.49.0.395.g12beb8f557-goog From nobody Tue Dec 16 18:12:06 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 1376316F282 for ; Tue, 25 Mar 2025 01:56:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742867787; cv=none; b=HyC8SBFMsjUC/+ZnVEfLrIlP1DDnumS7jETjgfdj3Kecl9r+ioLVp0eHLiFHNg5+WbfB0ay9pN4C8fo92xVjm5ZYXWnlNHxpCcYX2ZBLbUzLIzZCvvNAI0X5uw73n+yKRFFJ0xvIN1GTvs4NR+ILFNZSyaH1fXRaIOOLJWWeVsw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742867787; c=relaxed/simple; bh=3Ssal8wO83LAvy5YDPICfixRHLNHOiETBBH4FyiHuA4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VLJJKGGSJ9s7vXQJhtIa1E90lwX4SQvWTeDWaCWoSLOAdfRrTqf7imG8IMndPlpadlJsqz19gfnU9gEDghcp+fOJhFnJPS5NWg2vSGNp0rMKAAi8/Rqcfp7rOoO7Q0qdLH18NkFCquYnrpkmGOsNVd4sjXqfHHAgsncJOLVK/zg= 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=ai6+ezQl; arc=none smtp.client-ip=209.85.216.74 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="ai6+ezQl" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ff69646218so13478970a91.3 for ; Mon, 24 Mar 2025 18:56:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742867785; x=1743472585; 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=KbmWscRvAoMTscJ7YX1VjxJzdFRKT7QCMrJKO+SUNOM=; b=ai6+ezQl3Qry/w+DxlaCoWIW9hEYsT4UsBt8KqEaJZNhdBrqxfeUL5iOnecn1BG2af EDg+0uY07u1qxYRJm70E/0pvw3WHrhgIm03yhFAInkZ0AWiHuPsaeLZNjBxImQknNCl+ wGSWVWYNj9NYBxnRyEMs9tMXspQ0/lVdFIVD7U2E9y8rsfWZL1hamUHIAomkRpuArI5M 1B7Q2+lO7gGqNZT86Li/L2a/TImIAVPnMhFxB1HcRN9nsmQlQBfuRo/K7CXo6VkRUbEp JlZfOmuFE8+7711ikI/TgVPcJJccPyg5l+e0CV8lq3t3Ap31uK8YqGeFrkaBBZkzNULZ +/kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742867785; x=1743472585; 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=KbmWscRvAoMTscJ7YX1VjxJzdFRKT7QCMrJKO+SUNOM=; b=o0shyMrnaqUkKa4kWgisDgWuq6uUmJkTnZmF6/EiaUg7kVxR5NXuC1T0dNuEsqtOWG 0CNWyvfAx+xVdvUcH9gMDhjVFnmImvi5xLTuD5hU0Y66u3+5YaRkZkejVx1MoDNVD5hI Uc7E8ZBgFVoT31aIAwvhfLz9U/jTypNDB/9I/GyLFGYcQ6HPE+3IN3/oh1Fs6WxAT1Ch evceOjhmgwtJVZ5E3X3uwFrORJZKwTLvgT84Fba7r2K20FDTdX39DQqexuXdwXMwq22L kscJYp3/nn03UATYT1wyC82q0W+MxfUTzdFAQ2CTUxILy5SAic/lCHED3u2t4tlGdhUD yl6A== X-Forwarded-Encrypted: i=1; AJvYcCUdc+uCy+yuHUUgmBX+ZJCpQxZAvtq2Jry/ywNAr+PHyqbZuJIX4zxc+K5IGwECsaeO4QYgXkA17cfZwG8=@vger.kernel.org X-Gm-Message-State: AOJu0YxemDYFinun6UDulF6iPDt3NAe+RssaDOO1ouehF0FvcqRfAUr0 s4AlwFpAQw8zFAC8w7RjNdhsCtk4qLOB/hB/acGPas5+IhAVE3Cxr0g4gvejo7TizA== X-Google-Smtp-Source: AGHT+IHw/mFa4K32w6FBmgVCLK0lfqwfx84tHmcbhBFHdeJjTz1GHC7yDdmMbL5MTLDA5q8NZ++fySA= X-Received: from pgcu63.prod.google.com ([2002:a63:7942:0:b0:af2:3541:76e2]) (user=pcc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:113:b0:1f5:874c:c987 with SMTP id adf61e73a8af0-1fe42f2c872mr24619131637.15.1742867785611; Mon, 24 Mar 2025 18:56:25 -0700 (PDT) Date: Mon, 24 Mar 2025 18:56:15 -0700 In-Reply-To: <20250325015617.23455-1-pcc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250325015617.23455-1-pcc@google.com> X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog Message-ID: <20250325015617.23455-3-pcc@google.com> Subject: [PATCH v3 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 triggers an MTE fault. Implement a KASAN KUnit test that triggers the issue with the current 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 Link: https://linux-review.googlesource.com/id/If88e396b9e7c058c1a4b5a25227= 4120e77b1898a Reviewed-by: Andrey Konovalov --- v3: - simplify test case v2: - rebased - fixed test failure mm/kasan/kasan_test_c.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mm/kasan/kasan_test_c.c b/mm/kasan/kasan_test_c.c index 59d673400085f..b69f66b7eda1d 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 =3D 24; =20 /* @@ -1581,6 +1582,18 @@ static void kasan_strings(struct kunit *test) ptr =3D kmalloc(size, GFP_KERNEL | __GFP_ZERO); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); =20 + src =3D kmalloc(KASAN_GRANULE_SIZE, GFP_KERNEL | __GFP_ZERO); + strscpy(src, "f0cacc1a0000000", KASAN_GRANULE_SIZE); + + /* + * The expected size does not include the terminator '\0' + * so it is (KASAN_GRANULE_SIZE - 2) =3D=3D + * KASAN_GRANULE_SIZE - ("initial removed character" + "\0"). + */ + KUNIT_EXPECT_EQ(test, KASAN_GRANULE_SIZE - 2, + strscpy(ptr, src + 1, KASAN_GRANULE_SIZE)); + + kfree(src); kfree(ptr); =20 /* --=20 2.49.0.395.g12beb8f557-goog