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 34AFCC61D97 for ; Tue, 21 Nov 2023 22:03:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D63AE6B04D5; Tue, 21 Nov 2023 17:02:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D16A46B04D6; Tue, 21 Nov 2023 17:02:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B3DC76B04D9; Tue, 21 Nov 2023 17:02:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 95FBF6B04D5 for ; Tue, 21 Nov 2023 17:02:52 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 6C3AA80B32 for ; Tue, 21 Nov 2023 22:02:52 +0000 (UTC) X-FDA: 81483336984.03.2ECFC37 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf25.hostedemail.com (Postfix) with ESMTP id 06BBDA0022 for ; Tue, 21 Nov 2023 22:02:49 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=R7uyF5QN; spf=pass (imf25.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.156.1 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=1700604170; 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=bENwZ4y9at11fyPiOskvMKU8mh/7/LIbktuHI/SFbGRoIflYxskZW/5tJIuIgghTX6DRcy v7oAplIMmeM+6RIyhayu/5JYuY5ZEzbO5liF5vIZvqzHnS9dZG0e675uygWpBfgPoledkV LKCMwruxqrPBSRUrG9nz+67gY9lWySg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700604170; a=rsa-sha256; cv=none; b=CSRbysqVDNQ9KXcMIIcTCi9pYPrkMHR6nsIPgoIHCyGrf+kghGBig0XVUT2B9B3ejIIdXn l5Euxl2RHIUXPWRaK3svX83H7Z22HVJTltQNStX52xfJcCUx0wKn1xKXbhdfLGTiNHSCSh 4VxrpX+OM/ChcBj8CWk9TwRvYkC1tUo= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=R7uyF5QN; spf=pass (imf25.hostedemail.com: domain of iii@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=iii@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ALLv9hG004965; Tue, 21 Nov 2023 22:02:43 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=R7uyF5QNom6pN6IBd3nildZSrtcZliHChhJ/GeIJvUNF+EipxafiIvS97SB8gwPwhdi7 wfnA8CtypmGthqq3L4NW+88Q0PBQJ1mSVw32lPxW57ZZMBbP3zvKmuAtrOO7+5xn/a4D iLWQRKyodtiCZVlMfIRIUjy/YfQgvps/nI80Hl1LKR81OLAVhccTQCKdWdTudtf2y1AH vchLVJfuB9tEyQLgC/9nOPrdId99eWWSwwnqyvg2mkZ2bSDCei0H1jFDCgTm/3W0poQq 6Ntf+KEnufdnj23SLQqIe85hUUrUaPw1XGde+Jm3PnGl4gaZ0cNYvPHhrVUF90ZPX9Wb 1A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uh4wn85ar-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2023 22:02:42 +0000 Received: from m0360083.ppops.net (m0360083.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3ALLwvpK009496; Tue, 21 Nov 2023 22:02:41 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3uh4wn85aa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2023 22:02:41 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3ALLnWGn004713; Tue, 21 Nov 2023 22:02:40 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3uf7yykvj4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Nov 2023 22:02:40 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3ALM2bBa15597856 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 Nov 2023 22:02:37 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 31E082005A; Tue, 21 Nov 2023 22:02:37 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BA2DB20063; Tue, 21 Nov 2023 22:02:35 +0000 (GMT) Received: from heavy.boeblingen.de.ibm.com (unknown [9.179.23.98]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 21 Nov 2023 22:02:35 +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 v2 18/33] lib/string: Add KMSAN support to strlcpy() and strlcat() Date: Tue, 21 Nov 2023 23:01:12 +0100 Message-ID: <20231121220155.1217090-19-iii@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231121220155.1217090-1-iii@linux.ibm.com> References: <20231121220155.1217090-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: b6FO-wjNpOLbu-pXCF5KwWPZydmy0FRF X-Proofpoint-ORIG-GUID: BYbwoAtxv4M2QJEIoKEhTF2ta84U2GAL 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-21_12,2023-11-21_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 adultscore=0 malwarescore=0 impostorscore=0 mlxscore=0 bulkscore=0 phishscore=0 clxscore=1015 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311210172 X-Rspamd-Queue-Id: 06BBDA0022 X-Rspam-User: X-Stat-Signature: tngfgsyaxi6auwwyuyww36z6o4iredqh X-Rspamd-Server: rspam03 X-HE-Tag: 1700604169-540916 X-HE-Meta: U2FsdGVkX19CBHoNjt85EsEfzs0N3yUpu4d79P24N0zD5bZ8vaboUKvhf4Z/i3IEQvZMXmTH9762zfHwQAqUOKRykPq/NzcsQgzEPTLCW2qITYX1dWrtra4p2UMzYe7Gi7dihohrPOOwaVHfIvxPf97mrLooVADUxNQOL304hRD39zGrkJa37G/G/QXigDAPOOt2oFwGbNbhRiaYJBTwbjHNXLTscKd1yztGGpFc7IZlRYinPpcPgCu6VTj7OW7zOPWkLdl/qk+5IJR7gwlfBSluY0xL1o8e/Uhpnhilen/83eUBrG80Ao7VuZJ5R/Ld1vTWNoubim6OVrHt6a6ekcCmdpzpNqoPwDPCgGL/faaxmoW5SkqRzvqCai0fyUw+n7Sizz8017VShgCdY/Ny3z2YmYW9WlgFKt/c0R0KptbkU8NDgAFPWA4JrrwQHEe7djWww2RM7hGlbyffTtsHTNtyhjw0eiPrbcJBeImuM7ZFWRQ3AriMpVneVQXd7hPcbfFuoMOxIM3blaFme3umJqtw8N8gVziIdD90kTh7pzgpamWbyDWi9vjiR+gKZDrbDHL96fKI6xpDZs28Sz/GaDy2Z43ctcxGW/KZATrqEpQT10fv+izyKhWBNptyAZ6414+rGhundnHqeIo/rvfZLMo0QgIaH/V1kDCklYbXhlHDZEeAU/mCEKS6ykc0cxoCXnUmUPh3T4eHJoW1eRRbnUjkAnmfVN4zpupl1WRSj/+wgImjE0qCt5t7RlRD2wSo6V1EVntNa4IsgoblV5G7McVU4a0B0EHuVytQH/mrs3vuToE4/lU2d99aFdsVqz9WscPFlfG6smH8fkIM7jArORep8wSRf1Mhd0E6pklq4rHA0I5DQXEqult6dEj63zzSOesd4OcNpvP/n4GKb7mYcCjqPmJ00jYaNtRPHEI7Fno/44v3ews3GPGoG4/r8Aw69ihLLGNFHOLVGenKKHg 6t4e01vS oAgJPsGGYdgP395OfUiXzbG9hzp5cSJ4dV/3yny5EfeRmEXx6ng/3oO96vjV34cr1Linr5dMH5MpO8Wk6LaMDOioyrROj+ZrNvso/MEoE9OIgilV7N0o7pQ/5vKmJ0+WyZsvtLy4RCyj60zCCQvaARHj3Osk9kOcZl7TFeapzA0JBCyAoAuLI8rj2IPcCzbJFYv3e5F1CvZN7usVHets+yksohA== 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