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 DBFC2C54FB9 for ; Wed, 15 Nov 2023 20:34:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB97D80036; Wed, 15 Nov 2023 15:34:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C421080032; Wed, 15 Nov 2023 15:34:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A211980036; Wed, 15 Nov 2023 15:34:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 8388380032 for ; Wed, 15 Nov 2023 15:34:51 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 541CC1408A4 for ; Wed, 15 Nov 2023 20:34:51 +0000 (UTC) X-FDA: 81461342382.10.5CF83C4 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf18.hostedemail.com (Postfix) with ESMTP id 0A99A1C001E for ; Wed, 15 Nov 2023 20:34:48 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=Fsbw4u7f; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf18.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=iii@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700080489; 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=FBHiR0R3HqDameObtBi5tDwt9B6xgR+xiaoV3r5rhIA=; b=BeNaaEw1mtAigDvaM07PFSTXwvT1XhbWmYJ5ewECG/sFUJjMExXkLBdWxjUgHooR1S3bMr 9ibwZYYSK/aCrfKTh/mUL4aLuTOcCyj/AQDY4vexP3JyaMNmds8qyECdQVy0ZEBPP0sjE6 8AhtYPHxw8E7a6fRogdyIoBNTPeCa0A= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=Fsbw4u7f; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf18.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=iii@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700080489; a=rsa-sha256; cv=none; b=nr+M6I6K84BbUEc+UdILd3pREDEmLDwF6vnBFS+CSd8188llz/SlQK6ewmoWUk5HTG96JC Tdg/iBl2olTQ01a/9QI8JG3z5vuP7k1OqEqPmFnc5Xh9AZ5HGV99nB+6CQRPaJHnXZZVN9 hIxgm34FcbHhpbIWoYZJ9HYlSnvpGTo= Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AFKGBf9020343; Wed, 15 Nov 2023 20:34:42 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=FBHiR0R3HqDameObtBi5tDwt9B6xgR+xiaoV3r5rhIA=; b=Fsbw4u7figkGz1teJMQ8day7onkmLRVQHzQQoQohRyi12JtEc4E+THn9ncooeU1blL95 BSNrmP6042dwc2gTk3PtIT3ZaPtRz5G3nE8fT130QRaywFogH6cOz+yX7seocVTQ3OEQ OLcP8i+gO/6updNe1Wh9Bcm6M3uTRMccbL90MJr6HJbHMQA1tEeaceaprV/0JDzkHyAO HHsf9P12TzXM81H/2ksj4UK5laexB6lxpNfnRFikO5/v5KPh3CFSqfC1zUm/LZtmEJDB IbsVe3RBRne0bOE+fKv3osgoJD4TfGRisBCHguVl9A33hlBA9duhPIg2UJ++MxrN/Ipw rA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ud4ch9bv2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Nov 2023 20:34:42 +0000 Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3AFKGRQZ022066; Wed, 15 Nov 2023 20:34:41 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ud4ch9bun-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Nov 2023 20:34:41 +0000 Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3AFKIvqo021610; Wed, 15 Nov 2023 20:34:40 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3uap5k9kay-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Nov 2023 20:34:40 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3AFKYbWA23069318 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Nov 2023 20:34:37 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9EA3A2004B; Wed, 15 Nov 2023 20:34:37 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5288420040; Wed, 15 Nov 2023 20:34:36 +0000 (GMT) Received: from heavy.boeblingen.de.ibm.com (unknown [9.179.9.51]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 15 Nov 2023 20:34:36 +0000 (GMT) From: Ilya Leoshkevich To: Alexander Gordeev , Alexander Potapenko , Andrew Morton , Christoph Lameter , David Rientjes , 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 17/32] lib/string: Add KMSAN support to strlcpy() and strlcat() Date: Wed, 15 Nov 2023 21:30:49 +0100 Message-ID: <20231115203401.2495875-18-iii@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231115203401.2495875-1-iii@linux.ibm.com> References: <20231115203401.2495875-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: WE4fc2MWwcSfv1ysVLGFiuvMJSpg76OK X-Proofpoint-ORIG-GUID: Mee9YG8eX7q6Hn736J-ftydiuuw4ftdn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-15_20,2023-11-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 mlxscore=0 bulkscore=0 mlxlogscore=999 lowpriorityscore=0 impostorscore=0 priorityscore=1501 phishscore=0 spamscore=0 suspectscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311150163 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0A99A1C001E X-Stat-Signature: xafw5j186hi5d7bxkjrgde4owbgmjd5h X-HE-Tag: 1700080488-16216 X-HE-Meta: U2FsdGVkX19issUrsk0iYraa7LX+nj1ppTpJddr294s6TTTwXbVpcNMy7ZP/rdZ5vVcMo1t7uAKMgkLKaTekgJf+i7X5lEiPUjZfjKX/90lSYFu9x2ZIWO4/3iyYVCJtMbF0XvkOl65zPBeeJ5jeOtpIqTF6dhi9W9lAwjyQCAaTldnJ6UDiWJX/a6zvXZRuXGQVZlq3Sqf0wSHMgSRaVVapsxUV87gU4Y60rnT+f9c3pxpudU8nRykwA5FVdpO74O51jPZErJSbY7WDIQLdxLSQSaeIAGMudBZUWFkRT0s3lyW/CDsxbh4NS11qt7r7SNKzJOLrAlqhZdMfNMd6YR068A9GFrFFmy6QojD8oqJtQoprtOheL+KxxeP/IY/muYldupoDMFEiNjIqTYpYDPzPf3C2QQ7vkgUaXhV3HZIUiyDkGZ10CCPecslZxlW0/mQel99XZouJmz1T4Y765e24VQ5vlLFwIbC6zSKm9zk2eHvVTt5+22/tsRRowfTHw2DQh9JDWwp4HwpTnn9nM4CRR0ed+yfMDitFfhYqQX1R4z/h2XAZ+bdQsiMSVgiG3+lYEPXusxWlCO7z6L9QQcBUF6anQAoJCW1d5OUbg5OHERKcZ+cudQQonzb00r2Pa2JAivxXhdho7TTJRxzqvE31rqzSgn+W61rWq4QzrTJ3Pd3KH9HdzAFrV/d39mCPmaco1XClfG0tBKWQHfcZDtFxebkKd7Hh+wj+LZ/vD650BVxaF3F2FhREd46cRl4Ty9TsS27CnXIvjvjzickeI0gR+c4/M1bMRUWB99lVn7tmYHNu0uB275fwahtyb5ha1XmSdaAZRRmFRSfGu12ZZaFPgfqsEGp21nm9xFHxgBPZBX3i696I7T33xJXjd7JkT0RXmlvaBTsrUorDK5wgRR95l/NRiNSd7Q2qMbymZk6LOZ8iaEVczDbdcM/vNhE7h+9wFbWgCVRPAB0cQrb Mly76oSY c3apuFoR26N+bfG61+Eo71a3Skx9vAkcDQ008LmqDEIB0xE0dgFj6Y2T1k36TMgU+nQSRQjI7q5EGRKEFuluVXixOz2RLmypNxTBXoNdIn8Z0zppdkDcE/n0iy4ybQcBzbMXaLtH8MOQ5XJ5/WGiwBdd5AxcfNIX/RzceV9YyouBwP8dO+iCCXTrOTtzlI2YzVxk7T39mpME7w1BbLsXhKuLhMZa/vWYJZVVK2cgHOD+GT5P/0LJs04ql+bDh3VKushFbB1K2G6Wf+U0M2juAG9jZ/cbBxUwtaTc8lQHcxItcSVhERt+fCDFJdA== 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: Currently KMSAN does not fully propagate metadata in strlcpy() and strlcat(), because they are built with -ffreestanding and call memcpy(). In this combination memcpy() calls are not instrumented. Fix by copying the metadata manually. Add the __STDC_HOSTED__ #ifdef in case the code is compiled with different flags in the future. Signed-off-by: Ilya Leoshkevich --- lib/string.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/string.c b/lib/string.c index be26623953d2..e83c6dd77ec6 100644 --- a/lib/string.c +++ b/lib/string.c @@ -111,6 +111,9 @@ size_t strlcpy(char *dest, const char *src, size_t size) if (size) { size_t len = (ret >= size) ? size - 1 : ret; __builtin_memcpy(dest, src, len); +#if __STDC_HOSTED__ == 0 + kmsan_memmove_metadata(dest, src, len); +#endif dest[len] = '\0'; } return ret; @@ -261,6 +264,9 @@ size_t strlcat(char *dest, const char *src, size_t count) if (len >= count) len = count-1; __builtin_memcpy(dest, src, len); +#if __STDC_HOSTED__ == 0 + kmsan_memmove_metadata(dest, src, len); +#endif dest[len] = 0; return res; } -- 2.41.0