From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91C3F8475 for ; Thu, 20 Jun 2024 00:58:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718845132; cv=none; b=r/uTZJlDclRsFRWIHAic1FASPgFGAMOODmCTLzBKqgNapcs7Gtf3tUmOopRjeSv6WkZXhkD6hcNQ7IqlirgEZncngz/P72m2JRexY4oXhbHhf9bUMtJen5et1OQ2EqrAOE2hXbOHJncUZLx1Cq074st1tNoaYdQAfQu8uANPy6U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718845132; c=relaxed/simple; bh=CnNNkZo3SYl6H3CtoZCtyK0RENrAtlOE9Ak8KY6q9Gg=; h=Date:To:From:Subject:Message-Id; b=QkBTd30bqdcodfdAHiy3teKyqcI3XgHpLzFgiO5p/+l4P0HUOMwCLxTDu/NcTF/uxyhINMCHM7cYRYx51+FLTwEcY9MtmrUHrQinh1SqDtH3fPbiBjeQHqhazDT4kaCFEYPTr1K01HKgyX5jo3YjnlNHLRk3YWERNxwujlT6dkg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=PMHrSKxk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="PMHrSKxk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 665FFC2BBFC; Thu, 20 Jun 2024 00:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1718845132; bh=CnNNkZo3SYl6H3CtoZCtyK0RENrAtlOE9Ak8KY6q9Gg=; h=Date:To:From:Subject:From; b=PMHrSKxkzgPqsk0AluododnCTfs5Mv8eXF0hqOFiz+UBxjMVU1yCwqWpZyEtYJU27 Zb1x2QDKUtwXjpjGANBwrZdKLMOzt+SLHNrZG1i2zjmlMXt6cz1JjHmjHMMAtTL3ND wJdtCBYeuPaXJywG42DY03OvYlb7/iVNqbSPLUCU= Date: Wed, 19 Jun 2024 17:58:51 -0700 To: mm-commits@vger.kernel.org,vbabka@suse.cz,svens@linux.ibm.com,rostedt@goodmis.org,roman.gushchin@linux.dev,rientjes@google.com,penberg@kernel.org,mhiramat@kernel.org,mark.rutland@arm.com,kasan-dev@googlegroups.com,iamjoonsoo.kim@lge.com,hca@linux.ibm.com,gor@linux.ibm.com,glider@google.com,elver@google.com,dvyukov@google.com,cl@linux.com,borntraeger@linux.ibm.com,agordeev@linux.ibm.com,42.hyeyoo@gmail.com,iii@linux.ibm.com,akpm@linux-foundation.org From: Andrew Morton Subject: + lib-zlib-unpoison-dfltcc-output-buffers.patch added to mm-unstable branch Message-Id: <20240620005852.665FFC2BBFC@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: lib/zlib: unpoison DFLTCC output buffers has been added to the -mm mm-unstable branch. Its filename is lib-zlib-unpoison-dfltcc-output-buffers.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/lib-zlib-unpoison-dfltcc-output-buffers.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Ilya Leoshkevich Subject: lib/zlib: unpoison DFLTCC output buffers Date: Wed, 19 Jun 2024 17:43:54 +0200 The constraints of the DFLTCC inline assembly are not precise: they do not communicate the size of the output buffers to the compiler, so it cannot automatically instrument it. Add the manual kmsan_unpoison_memory() calls for the output buffers. The logic is the same as in [1]. [1] https://github.com/zlib-ng/zlib-ng/commit/1f5ddcc009ac3511e99fc88736a9e1a6381168c5 Link: https://lkml.kernel.org/r/20240619154530.163232-20-iii@linux.ibm.com Signed-off-by: Ilya Leoshkevich Reported-by: Alexander Gordeev Reviewed-by: Alexander Potapenko Cc: Christian Borntraeger Cc: Christoph Lameter Cc: David Rientjes Cc: Dmitry Vyukov Cc: Heiko Carstens Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com> Cc: Joonsoo Kim Cc: Cc: Marco Elver Cc: Mark Rutland Cc: Masami Hiramatsu (Google) Cc: Pekka Enberg Cc: Roman Gushchin Cc: Steven Rostedt (Google) Cc: Sven Schnelle Cc: Vasily Gorbik Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- lib/zlib_dfltcc/dfltcc.h | 1 + lib/zlib_dfltcc/dfltcc_util.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) --- a/lib/zlib_dfltcc/dfltcc.h~lib-zlib-unpoison-dfltcc-output-buffers +++ a/lib/zlib_dfltcc/dfltcc.h @@ -80,6 +80,7 @@ struct dfltcc_param_v0 { uint8_t csb[1152]; }; +static_assert(offsetof(struct dfltcc_param_v0, csb) == 384); static_assert(sizeof(struct dfltcc_param_v0) == 1536); #define CVT_CRC32 0 --- a/lib/zlib_dfltcc/dfltcc_util.h~lib-zlib-unpoison-dfltcc-output-buffers +++ a/lib/zlib_dfltcc/dfltcc_util.h @@ -2,6 +2,8 @@ #ifndef DFLTCC_UTIL_H #define DFLTCC_UTIL_H +#include "dfltcc.h" +#include #include /* @@ -20,6 +22,7 @@ typedef enum { #define DFLTCC_CMPR 2 #define DFLTCC_XPND 4 #define HBT_CIRCULAR (1 << 7) +#define DFLTCC_FN_MASK ((1 << 7) - 1) #define HB_BITS 15 #define HB_SIZE (1 << HB_BITS) @@ -34,6 +37,7 @@ static inline dfltcc_cc dfltcc( ) { Byte *t2 = op1 ? *op1 : NULL; + unsigned char *orig_t2 = t2; size_t t3 = len1 ? *len1 : 0; const Byte *t4 = op2 ? *op2 : NULL; size_t t5 = len2 ? *len2 : 0; @@ -59,6 +63,30 @@ static inline dfltcc_cc dfltcc( : "cc", "memory"); t2 = r2; t3 = r3; t4 = r4; t5 = r5; + /* + * Unpoison the parameter block and the output buffer. + * This is a no-op in non-KMSAN builds. + */ + switch (fn & DFLTCC_FN_MASK) { + case DFLTCC_QAF: + kmsan_unpoison_memory(param, sizeof(struct dfltcc_qaf_param)); + break; + case DFLTCC_GDHT: + kmsan_unpoison_memory(param, offsetof(struct dfltcc_param_v0, csb)); + break; + case DFLTCC_CMPR: + kmsan_unpoison_memory(param, sizeof(struct dfltcc_param_v0)); + kmsan_unpoison_memory( + orig_t2, + t2 - orig_t2 + + (((struct dfltcc_param_v0 *)param)->sbb == 0 ? 0 : 1)); + break; + case DFLTCC_XPND: + kmsan_unpoison_memory(param, sizeof(struct dfltcc_param_v0)); + kmsan_unpoison_memory(orig_t2, t2 - orig_t2); + break; + } + if (op1) *op1 = t2; if (len1) _ Patches currently in -mm which might be from iii@linux.ibm.com are ftrace-unpoison-ftrace_regs-in-ftrace_ops_list_func.patch kmsan-make-the-tests-compatible-with-kmsanpanic=1.patch kmsan-disable-kmsan-when-deferred_struct_page_init-is-enabled.patch kmsan-increase-the-maximum-store-size-to-4096.patch kmsan-fix-is_bad_asm_addr-on-arches-with-overlapping-address-spaces.patch kmsan-fix-kmsan_copy_to_user-on-arches-with-overlapping-address-spaces.patch kmsan-remove-a-useless-assignment-from-kmsan_vmap_pages_range_noflush.patch kmsan-remove-an-x86-specific-include-from-kmsanh.patch kmsan-expose-kmsan_get_metadata.patch kmsan-export-panic_on_kmsan.patch kmsan-allow-disabling-kmsan-checks-for-the-current-task.patch kmsan-introduce-memset_no_sanitize_memory.patch kmsan-support-slab_poison.patch kmsan-use-align_down-in-kmsan_get_metadata.patch kmsan-do-not-round-up-pg_data_t-size.patch mm-slub-let-kmsan-access-metadata.patch mm-slub-disable-kmsan-when-checking-the-padding-bytes.patch mm-kfence-disable-kmsan-when-checking-the-canary.patch lib-zlib-unpoison-dfltcc-output-buffers.patch kmsan-accept-ranges-starting-with-0-on-s390.patch s390-boot-turn-off-kmsan.patch s390-use-a-larger-stack-for-kmsan.patch s390-boot-add-the-kmsan-runtime-stub.patch s390-checksum-add-a-kmsan-check.patch s390-cpacf-unpoison-the-results-of-cpacf_trng.patch s390-cpumf-unpoison-stcctm-output-buffer.patch s390-diag-unpoison-diag224-output-buffer.patch s390-ftrace-unpoison-ftrace_regs-in-kprobe_ftrace_handler.patch s390-irqflags-do-not-instrument-arch_local_irq_-with-kmsan.patch s390-mm-define-kmsan-metadata-for-vmalloc-and-modules.patch s390-string-add-kmsan-support.patch s390-traps-unpoison-the-kernel_stack_overflows-pt_regs.patch s390-uaccess-add-kmsan-support-to-put_user-and-get_user.patch s390-uaccess-add-the-missing-linux-instrumentedh-include.patch s390-unwind-disable-kmsan-checks.patch s390-kmsan-implement-the-architecture-specific-functions.patch kmsan-enable-on-s390.patch