From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8538FC27C4F for ; Thu, 13 Jun 2024 15:40:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F0A856B00B0; Thu, 13 Jun 2024 11:39:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EBC4B6B00B1; Thu, 13 Jun 2024 11:39:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C97236B00B2; Thu, 13 Jun 2024 11:39:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id A58766B00B0 for ; Thu, 13 Jun 2024 11:39:57 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 65C771401F5 for ; Thu, 13 Jun 2024 15:39:57 +0000 (UTC) X-FDA: 82226276034.25.B011C30 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf03.hostedemail.com (Postfix) with ESMTP id 2722720008 for ; Thu, 13 Jun 2024 15:39:54 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=VORhykUz; spf=pass (imf03.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=iii@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718293194; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/gY59diCnvafEB+4mQiN4AxCmJVF2c9HWCLDsUZw+Ho=; b=cdyi+mFnOZiz8/E448nH21Aad98CrB/GsB8JsA4vAGKn0Wu5z4feytIA/nH3JC6Ckz0xIn YCVTSWZ9ie9CQWjeHKyAXXwN4XGNqc/Pqzp8SDpHG7wfdj6IsOzuWYwzaeaNkfTjIxkgnC xyfm92j/Odsw7Q8/V/5deUKd858z9jI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718293194; a=rsa-sha256; cv=none; b=rljiebgDmyvzAxm6zeguG79Kyd/XUA0pcgW/1NLcpl80C2MYcJ/MS2MkQ6zH7Qp9lf1tHS it2fAWqzEXHrxxamp9RRFkidRIwHDnu3PWmVvZxlXTaDh57GGzaePR0vGHDs3NfAZ1Wzpd 3RS6+qcDY9cuDadsOxHkuL5+xFRxGVs= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=VORhykUz; spf=pass (imf03.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=iii@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com Received: from pps.filterd (m0353724.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 45DEMmKu009466; Thu, 13 Jun 2024 15:39:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from :to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=pp1; bh=/gY59diCnvafE B+4mQiN4AxCmJVF2c9HWCLDsUZw+Ho=; b=VORhykUzQX07l22DxUNjzV7kQCcYh 7XxHs+Bps15m/3JBqePHkv3myq1XbKPZDKvC0FURk9yD/cR6iwe+1KOLSJj7EDqg quf/XqRbNm9Th+zGbk+uuhGQUaDZWSE2LYJAton/eF/dkq62fn0xjoQ/H7xG5rzx V0xS+gqlQXA/rJncbBaJ0ShISo1TnAfKhNrlvp9lSRSTEXgWomF18OJqzRXoDng2 NHEdQFOurXW/cZ6DMBn7PJzt5ky/1UT290NrJ2Zd9MIHLwGbK/0rFkYHu5HcZvBh PpRd788nlZdHsBOWYK9VPBgFfH0SQ97SovcNENgJ2JmvNSWelGZBuardw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yr28g8buw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:46 +0000 (GMT) Received: from m0353724.ppops.net (m0353724.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 45DFdkhn032507; Thu, 13 Jun 2024 15:39:46 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3yr28g8but-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:46 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 45DF54o7020086; Thu, 13 Jun 2024 15:39:45 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3yn34nh0bu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Jun 2024 15:39:45 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 45DFdduK48365846 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 13 Jun 2024 15:39:41 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7C5972004E; Thu, 13 Jun 2024 15:39:39 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 09E292006E; Thu, 13 Jun 2024 15:39:39 +0000 (GMT) Received: from black.boeblingen.de.ibm.com (unknown [9.155.200.166]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 13 Jun 2024 15:39:38 +0000 (GMT) From: Ilya Leoshkevich To: Alexander Gordeev , Alexander Potapenko , Andrew Morton , Christoph Lameter , David Rientjes , Heiko Carstens , Joonsoo Kim , Marco Elver , Masami Hiramatsu , Pekka Enberg , Steven Rostedt , Vasily Gorbik , Vlastimil Babka Cc: Christian Borntraeger , Dmitry Vyukov , Hyeonggon Yoo <42.hyeyoo@gmail.com>, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-s390@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Mark Rutland , Roman Gushchin , Sven Schnelle , Ilya Leoshkevich Subject: [PATCH v4 12/35] kmsan: Support SLAB_POISON Date: Thu, 13 Jun 2024 17:34:14 +0200 Message-ID: <20240613153924.961511-13-iii@linux.ibm.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240613153924.961511-1-iii@linux.ibm.com> References: <20240613153924.961511-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: d5DLJuwF3n7IYysGR2MUKcLztsyMiSDS X-Proofpoint-ORIG-GUID: gIfaDqrA226oT8V3lIkGJ1p31k8efaLW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-13_09,2024-06-13_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 phishscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 malwarescore=0 lowpriorityscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405170001 definitions=main-2406130112 X-Rspamd-Queue-Id: 2722720008 X-Stat-Signature: xieukkmbngjnwedrb641c3bdgo5pshub X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1718293194-966474 X-HE-Meta: U2FsdGVkX19jko7xGKDm1G7FMqE3be8FJWULlhgGQOdQEL0xocgqEqchxejlM7pzZTMYx0vHCyGS7KtNnahANOGp+9gcm+Z79tQ1njZRyG+7tGUmiRxCpf8iWLDk0wNPWrvYPS1yc4+rQHZCjcOfvRNzDpAdJ35B0AAjJIRPWZdFSNVumRLMihXx/Cbmb8130YEawPFgO1MqUygBoo9GFj9P3h8Gk60bqDDR3Ex6VxA5Jeskjltu/9mHa0iAeE+I/AelSqhQggRLTZY6zRp9rwHJ4kfl36jzrcEoEG1nxg1t04VoQk5dFfz2njh3HO3HFHec9fD9P4UNeKa1ZW9VD2J/c3zkbYQ/DprOEezQvRGG1d7Ggdy9qPDKmeBZrHtlDHa7fgB6qkL+McETNNjzc0dnUWHXLGXN20WKpxmuPEharJanEd+gVtYV1+5MackpCvySLkoLcG2f+44r0sBW5jUzl80mqGkOEK1URj7GdWOOJ5yqkGy9FZVoepv5Q9dvLrKMqpigJq4Yu8KD9YugIv2ZaD7K1Rbkt06teuGu0SK9kRmo8hhEhNTelUjWljNPlMQQGRi7YKtBrQPItsvoDlUysL5XQYjvqbA2ioCEpFbp9irO0l8WwTp3iXi9PcUQbagYbJ1MfdHHGM9cKpKvmT1qCbtE8CNdp6D94lH5w/eN7kmdIfs/iZ8qTog4ja6xmRDM+CROhMRJWLgrvCJwqoSAcXml7HD2WOK2qFOqhpdu/eY6Chu4VS3AjsmfZEx2QqBrYEP2nyYwpwaJ/0mpU2EiIu8QHVod4yCjejfcTOKHW9nKPGjHCsBUNBW2CslTnC7j8ZSIRvhbS7BQdVmpzMak0dUMMGaMVggxP6wRxCM30+scEMHrPW8lOR6XnsnxkKONsjg8trSEuLVQlp82Vfif4ajobtnrLMHCJneWmRxGgMUSdm8+KqMNJpL8iyYnynjVdxyQaX8ePuWAazw Qz6hkOg4 wsbVBdSUB9d0NaHL6cJcNY5Ry7JZSV07V9/O2RaP/xXQd9noY2bhyXknAQ82+hWOHmp+Fd8s9S6q1oxossbX2swYIPHVSsnrFIf2bmAA43+UWcQL99YztycGkssMWREnqduBXEqDc6Mxx3Sqe+NalelRKg5HRsHoz9WuHj/A/BL9miuRALjrqfzJN9FdRuWJa3R6esP77ID+Ucx9sEGn3qxTcXz8DFJoFCcM+/UwVwQoeqR1Sa9g0fQAUuyOap72BS8koCnKizeN7o/LAa/pUyH7N2zDT1GKjhUBNInbBqPMRRaM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Avoid false KMSAN negatives with SLUB_DEBUG by allowing kmsan_slab_free() to poison the freed memory, and by preventing init_object() from unpoisoning new allocations by using __memset(). There are two alternatives to this approach. First, init_object() can be marked with __no_sanitize_memory. This annotation should be used with great care, because it drops all instrumentation from the function, and any shadow writes will be lost. Even though this is not a concern with the current init_object() implementation, this may change in the future. Second, kmsan_poison_memory() calls may be added after memset() calls. The downside is that init_object() is called from free_debug_processing(), in which case poisoning will erase the distinction between simply uninitialized memory and UAF. Signed-off-by: Ilya Leoshkevich --- mm/kmsan/hooks.c | 2 +- mm/slub.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mm/kmsan/hooks.c b/mm/kmsan/hooks.c index 267d0afa2e8b..26d86dfdc819 100644 --- a/mm/kmsan/hooks.c +++ b/mm/kmsan/hooks.c @@ -74,7 +74,7 @@ void kmsan_slab_free(struct kmem_cache *s, void *object) return; /* RCU slabs could be legally used after free within the RCU period */ - if (unlikely(s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_POISON))) + if (unlikely(s->flags & SLAB_TYPESAFE_BY_RCU)) return; /* * If there's a constructor, freed memory must remain in the same state diff --git a/mm/slub.c b/mm/slub.c index 1373ac365a46..4dd55cabe701 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1139,7 +1139,12 @@ static void init_object(struct kmem_cache *s, void *object, u8 val) unsigned int poison_size = s->object_size; if (s->flags & SLAB_RED_ZONE) { - memset(p - s->red_left_pad, val, s->red_left_pad); + /* + * Use __memset() here and below in order to avoid overwriting + * the KMSAN shadow. Keeping the shadow makes it possible to + * distinguish uninit-value from use-after-free. + */ + __memset(p - s->red_left_pad, val, s->red_left_pad); if (slub_debug_orig_size(s) && val == SLUB_RED_ACTIVE) { /* @@ -1152,12 +1157,12 @@ static void init_object(struct kmem_cache *s, void *object, u8 val) } if (s->flags & __OBJECT_POISON) { - memset(p, POISON_FREE, poison_size - 1); - p[poison_size - 1] = POISON_END; + __memset(p, POISON_FREE, poison_size - 1); + __memset(p + poison_size - 1, POISON_END, 1); } if (s->flags & SLAB_RED_ZONE) - memset(p + poison_size, val, s->inuse - poison_size); + __memset(p + poison_size, val, s->inuse - poison_size); } static void restore_bytes(struct kmem_cache *s, char *message, u8 data, -- 2.45.1