From patchwork Tue Mar 18 21:40:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 14021607 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 9A1632066F0 for ; Tue, 18 Mar 2025 21:41:35 +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=1742334097; cv=none; b=caWx+FqKmBr/YFrPwg5PYfXyCsybfKpgCULr2im85OXTNuSR5LdzQJG0GMRt0AhONtngQFSCEXOn4+xRqFVQFuw/idW5KrxGbFS1/XKI9vuVRFil97Sxvncg8cJpff6MJtXmdxPK/DcmN0MYszL+pC5R05cf1mV06CfOuGvwtyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742334097; c=relaxed/simple; bh=2JVg6jNN+EXcNb7mKuWKPPuyH/BrxNNvi7msA7FPZpA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZlSvqQethK+sMfvL/7wV+TVr5nTsbAjlXmQQq+eriJ+yR210fxBHFtmao3xtUw4IP8xPR8JAQj0lwO3XCIAWSa7kWCDM/2j4s5M+R6ykl+tTGsPRZimwZx2BEWO9sEj2R+jrLiQk9Jp/bZaLfsMGR+XhiOzopehycM9vLudbeG4= 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=Ir5ZZQK6; 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="Ir5ZZQK6" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ff5296726fso10482307a91.0 for ; Tue, 18 Mar 2025 14:41:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742334095; x=1742938895; 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=+3v041miGofNddzBnUn4Cs5yNorfDPWogz1+D6wVoyA=; b=Ir5ZZQK62/5S4SYS82c6xIwYfeod1V+mSobHilPnykNkBIAPcaEG0e3y3ksPC7qAWF CmJuKyiBLOGrR1lyqB0aXtVwLyiSuiz9yvO7DhepJxRRo97a8mV97w0MuzkBFwG9T2fM tIUdK01ClzzM2HX/DJD8GvK1tzPXzPxu1BL6e02+bFJSq02vy6UROINqI5CMLEG/ztoz RMmhWZUbjqq8FmMqIGKENKXOR9JfOAkbMLzR4UO2Tu2eI6ah+qQ+uQcA3ADRWeAisN44 TbcSVOk+ke4N/zJAWS8eHS8yQFTCbqx4XUSwHtp4r/jBp8G4jvE7XYObetw/elotG9Dn c5Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742334095; x=1742938895; 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=+3v041miGofNddzBnUn4Cs5yNorfDPWogz1+D6wVoyA=; b=SfpSZI3jxjOckd0aK1OwtnU9+TAKMcj4riZq21weKnc/+8aDklcwiOq7MPO7danXFc qQvvwaAe7sIBsX/XOdRtgdchOAmelGwYGeAmACewxy0ssQV6/aCKVlfL5Y+6bRct3WnA FloSMF2Sj1BOyB5pjhoeARcdzs4GkD7/3bzM7y70ikH1ETelZdtR0vGrcQOKryOGwY2O dbVsmVhQg24EL+Ttquex8g1c1PAI6Af+Wbo0GxqDw1qTJ2MaJFNK7gWzhHGrUeRh57DI +yAgciedawulg9wgawYyE2FCBBGSsEUzWEohpnX5VS6hqnEIl0JCrTcCnUiDnCK3XrFr Xyyw== X-Forwarded-Encrypted: i=1; AJvYcCWWTV8QvcRmZrxwYiCae+dvnxm+QP+bJqAtU9Y6Rsq7zt4zOa4ZMJi33Jh2wGmzuq70zamkJBzbbGXDDgUu@vger.kernel.org X-Gm-Message-State: AOJu0Yxii3Cw92yi+LOl99V7G1165fDtoIeZTMI8AEPJCN75dDcZzdQU xlcLSCUEuu7CxMtxIkEBhDXdCvAoGYy3Hsw0h5CyeKkhR+vh9pCE7EAlTUIxryPELw== X-Google-Smtp-Source: AGHT+IFLY1EmXxbPh0DHXmzLlTkBArwizsU3t94Vw7f4cPApT4gnOzyKca7K7uUKbY1tEhJcornmRlo= X-Received: from pjp6.prod.google.com ([2002:a17:90b:55c6:b0:2ef:78ff:bc3b]) (user=pcc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:38d2:b0:2ff:6f8a:3a13 with SMTP id 98e67ed59e1d1-301be1f8f6emr353522a91.25.1742334094908; Tue, 18 Mar 2025 14:41:34 -0700 (PDT) Date: Tue, 18 Mar 2025 14:40:33 -0700 In-Reply-To: <20250318214035.481950-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: <20250318214035.481950-1-pcc@google.com> X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog Message-ID: <20250318214035.481950-3-pcc@google.com> Subject: [PATCH v2 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 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/If88e396b9e7c058c1a4b5a252274120e77b1898a --- v2: - rebased - fixed test failure mm/kasan/kasan_test_c.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/mm/kasan/kasan_test_c.c b/mm/kasan/kasan_test_c.c index 59d673400085f..c4bb3ee497b54 100644 --- a/mm/kasan/kasan_test_c.c +++ b/mm/kasan/kasan_test_c.c @@ -1570,7 +1570,9 @@ static void kasan_memcmp(struct kunit *test) static void kasan_strings(struct kunit *test) { char *ptr; - size_t size = 24; + char *src, *src2; + u8 tag; + size_t size = 2 * KASAN_GRANULE_SIZE; /* * str* functions are not instrumented with CONFIG_AMD_MEM_ENCRYPT. @@ -1581,6 +1583,33 @@ static void kasan_strings(struct kunit *test) ptr = kmalloc(size, GFP_KERNEL | __GFP_ZERO); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); + src = kmalloc(size, GFP_KERNEL | __GFP_ZERO); + strscpy(src, "f0cacc1a00000000f0cacc1a00000000", size); + + tag = get_tag(src); + + src2 = src + KASAN_GRANULE_SIZE; + + /* + * Shorten string and poison the granule after it so that the unaligned + * read in strscpy() triggers a tag mismatch. + */ + src[KASAN_GRANULE_SIZE - 1] = '\0'; + kasan_poison(src2, KASAN_GRANULE_SIZE, tag + 1, false); + + /* + * 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, size)); + + /* Undo operations above. */ + src[KASAN_GRANULE_SIZE - 1] = '0'; + kasan_poison(src2, KASAN_GRANULE_SIZE, tag, false); + + kfree(src); kfree(ptr); /*