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 D9FB5C25B79 for ; Fri, 17 May 2024 15:22:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 49C236B007B; Fri, 17 May 2024 11:22:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 44BAE6B0083; Fri, 17 May 2024 11:22:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 33AA56B0085; Fri, 17 May 2024 11:22:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 16E226B007B for ; Fri, 17 May 2024 11:22:43 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 99B6A40383 for ; Fri, 17 May 2024 15:22:42 +0000 (UTC) X-FDA: 82128254964.16.C1677D1 Received: from mail-vk1-f179.google.com (mail-vk1-f179.google.com [209.85.221.179]) by imf24.hostedemail.com (Postfix) with ESMTP id CD84E18001F for ; Fri, 17 May 2024 15:22:39 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ZUuFXiI9; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf24.hostedemail.com: domain of elver@google.com designates 209.85.221.179 as permitted sender) smtp.mailfrom=elver@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715959359; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=a0X1IdGrvgRbIDZDbKlklVPOFj9du4fG+oJBScJlx9I=; b=fc6vq/j1+i7lcXpdOE9HgptVZq0Jz7Ew3IpzfWGJbQHwGCnsncX0PSXRFJupSfVQh2eQWp QwjY1amPDsXpwJFmLuSPUbI3wdpPOkA1LtW1g/MWmijDF8rM3PG9Gr0wR9blmT9Rl6CYwj EIvJmgpYknnnzRAbBSaxWbhQj7/ou8c= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ZUuFXiI9; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf24.hostedemail.com: domain of elver@google.com designates 209.85.221.179 as permitted sender) smtp.mailfrom=elver@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715959359; a=rsa-sha256; cv=none; b=rPSzi9PQ5vAFC7jDql2JZcySLUDCHCt04lZKGDO4A9ixAl3yzLrBgPOyxW/pWyImJjrgo5 iaKqz7lffXpoMKtAFOf66VKUCL1JBbYwtHPorAotJ8VEx6E1jFU+N6sSN34zCBGGzV8dEo 6IIAAGzubYH6qn2FPLamM7g3lIENiNc= Received: by mail-vk1-f179.google.com with SMTP id 71dfb90a1353d-4df3d4f0bf7so245758e0c.0 for ; Fri, 17 May 2024 08:22:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1715959359; x=1716564159; darn=kvack.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=a0X1IdGrvgRbIDZDbKlklVPOFj9du4fG+oJBScJlx9I=; b=ZUuFXiI9XQYr7ihneYZ+oeqoK9BrkC80W+xGiKUT2rQMV0qG/ObxwiFA5TQ0SV32ja 5OAxgybF3DAoaXi83Z4ro5+eEhparGWUlMbdtyysZpaoZyjrfK1MmFNd91irBpotanQ0 n/wJm9girjjwveo35S8KtO4zhFi0jBMmWfSp9NlkVY/iwpjcrIkxGPiRva8IxANYUekI fPM2RbYCRso9bGQJQ0QsT12kYEbrM2hi9G6JtTiUBCiQ8y7XVZ7ghlQYCEfd2sNrQWIc Gjxfv7bL+h18oJAqW9fwg0kWnwBxX3d2oDTaNVGLbrFR4Jv4JK/OdjlSB++f/dBQb+4Q 3qxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715959359; x=1716564159; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=a0X1IdGrvgRbIDZDbKlklVPOFj9du4fG+oJBScJlx9I=; b=XkZRdlj3opA79HWGqwJTudBPlWsKTOvsXRtZyrsprHpCJXLzOt13eKDJMxFxLyIMMS npdxLI4vpw1QF2dGO0ShSt30gb/L37uyl2Ca1viRkf7MehbNRbzFS2V8nBGwJ/slCepU RkecmWy59D8qezEy99XUPh2sBxsGpH49W3ve/TGib8gtKe99GZt8TtLMXh74wn9uAcL3 qHCxZc+ez7/w5ViSjIbsFu4vw4E4XiF7KgNXUEixJQyc6mo+Kv7kMZxzs5myAUz9fksy NkCJhxpWiGYKbyGtZRxW/PkyFFbt7CXPGeika8iEgbV54LG6c/nHKL8ACqSnOAFFB04O tA2A== X-Forwarded-Encrypted: i=1; AJvYcCUBdauVPzNJlU7rqQa3PtXDlrVqJzCrAAMZZW1LcB3jMxd7iNAkRPQ8YySbGkExPNg2WK3cDnXIyFhqgRKNrC7v/Wk= X-Gm-Message-State: AOJu0YwZp8O+XTVmF9yyUQjZ+sJ3ctUL7q18K0LL4QXFtMkBLC/q165/ v9l3R+8AyFuQ1YgK3sGMarnPPY5tHMmR4Vt8x3LILgjaFN7nlZ99m51P6WPBYYZnXAGJ3nLYmXR hl36lZBpbU9Um7Rwlu2OcB6TVW7xPAvN2+gnK X-Google-Smtp-Source: AGHT+IHimgZxVAtnI+vF7pLVRq7Oh/c7g37qx4xedEDmPMvZxwY+/11EHWLfIn6MDIjYi7FNRJ9mzDpxRGtc3xtIs5c= X-Received: by 2002:a05:6122:98a:b0:4d3:362f:f9c1 with SMTP id 71dfb90a1353d-4df88359107mr21578723e0c.13.1715959357364; Fri, 17 May 2024 08:22:37 -0700 (PDT) MIME-Version: 1.0 References: <20240517130118.759301-1-andrey.konovalov@linux.dev> In-Reply-To: <20240517130118.759301-1-andrey.konovalov@linux.dev> From: Marco Elver Date: Fri, 17 May 2024 17:21:58 +0200 Message-ID: Subject: Re: [PATCH] kasan, fortify: properly rename memintrinsics To: andrey.konovalov@linux.dev Cc: Andrey Konovalov , Alexander Potapenko , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Andrew Morton , linux-mm@kvack.org, Erhard Furtner , Nico Pache , Daniel Axtens , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: CD84E18001F X-Stat-Signature: wsxzp3jk833g88f3twf8rwisdi5t67se X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1715959359-275237 X-HE-Meta: U2FsdGVkX19YOpzQ3jYZmiAcVIpVlyE8VzqTteoI+8q8L4r17G/BNvjnvOqvJx7g1Nqgx0zGBFfYTkZqS/ilCkBZpim+tdIuP3B/q1pwXUCPHh12g2/70DVneaWZWxRxWRx4UwKuudHJm2KQjomfJswcpg2dvZLZlOLGlLSLKKFZvZVPF1RqVV0mT2J0laR+lgC0TLfZOM9WdnP3WFM21VBGDSIqkQYz0iUS+4jl+t3c7C8YLnOVXav3yIm0hLdvnNjNtoQouBBDIfQj8zUdnOIiGD7jVcIi0BqIJ/Bqrj4bVcD6Ssio3wSej4szmbKNkA/KIMNNVs9aE/gMOvXegTRd0Aoh7C3Qju69io5QE7MANpAkbfdO4Ssm9PJPUd8MYZhbY4Tc+KoTwOZLG+dsT8z4HbnXc8COATsYYH/IHlkQ1eA4T1mkYFkapH6zkBRIveaNn1rZZbwWeHxI2aGg7lZbwMEDmNCxoib1QyfUiH2xqu1f36yDdR/MW253g1K1Q5LpcaPf9JTA/z5ZbQLMpl/VCA1HSfvQ1Votvvt8dPV4xdYPxif7DN2L6VKiy5Gq/rsSmZWiiPKOtWgm2cRR8YzRZXpYpWptpxSmzvuXdk7brYS0a+Nnc7QN1OrUQ8phksxFohSUYJ7UAGn2VbGC0hzpXTWmqs5tcs1ePX1p+kX4DNHErR+/P+SVfzwvP/41sZPymyMzqbIIXV7PJ3zrDeLRkxvqw1n+FTiZEBlm5hIJs5yjwZrNIGXiyo7/uS2vn7+Kg/tAi9G6WTjaoog38Uq+4KxUm4pVQEf2iArOkqwB7kmTRRvGsD1lWhkbOFHIv0FU8y1f6SOIJkGl7glkgQn+1NStq8H+QpHXu8qYOAbZe8wZsO9vkFsthfyt2/KaM8VdXB53pCttmZ/QlmNNlEyvrKCa5LzSQJYfyJBr9RE64hnbLSfIDUBG+E8SjQsDq/NOSp+3mtt6w7Md8zE H+Y+WCMA 7lgEOljVxWDHbLNLXk9O4n7uK/Uw/Ki0J8iblBpFlY290htn6lOoYA5TYPmsxj/ZcuECWATPUm2IJ+w4jW+Swn3Wh7RHi5hXOpNjaLNZ40x3f1d8Jsv5gmlrvNWAWBT2EwhK5E0xdo//Z57O/KbHHDgqVe/hRiGr142LlroymhanUb7YRD8TtiBFMfc4cg51bUqaRI265AeZoI+4MnzjcMMJ0PkbBRGX7K0VOI8JHsHtCn6TfG4VM5onf5pYeGFJYMRnETtJRXVsYp9zxzJ0mzUDlrSyEKtBjeUhvLCfVcsq36AlX9V6mdN7AvuBuFoYK2Pzbol+D/TFbIeHCJvXqpJTXe04jLF8mj6p0pVSp1j0qgRSyuVPBLZWYCvdBlLXxYfNwt+K66jLCak8JzSkjMTPPm2JV3fRE+H8gIDGOFZORzY4TplBHJDGY3PpqfD9rDhTZWIaN9WAvUNKyzydscLQQsZIw5K7PzMIBbFw5IDpcKuI= 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: On Fri, 17 May 2024 at 15:01, wrote: > > From: Andrey Konovalov > > After commit 69d4c0d32186 ("entry, kasan, x86: Disallow overriding mem*() > functions") and the follow-up fixes, with CONFIG_FORTIFY_SOURCE enabled, > even though the compiler instruments meminstrinsics by generating calls > to __asan/__hwasan_ prefixed functions, FORTIFY_SOURCE still uses > uninstrumented memset/memmove/memcpy as the underlying functions. > > As a result, KASAN cannot detect bad accesses in memset/memmove/memcpy. > This also makes KASAN tests corrupt kernel memory and cause crashes. > > To fix this, use __asan_/__hwasan_memset/memmove/memcpy as the underlying > functions whenever appropriate. Do this only for the instrumented code > (as indicated by __SANITIZE_ADDRESS__). > > Reported-by: Erhard Furtner > Reported-by: Nico Pache > Closes: https://lore.kernel.org/all/20240501144156.17e65021@outsider.home/ > Fixes: 69d4c0d32186 ("entry, kasan, x86: Disallow overriding mem*() functions") > Fixes: 51287dcb00cc ("kasan: emit different calls for instrumentable memintrinsics") > Fixes: 36be5cba99f6 ("kasan: treat meminstrinsic as builtins in uninstrumented files") > Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver This is getting rather complex, but I don't see a better way either. > --- > include/linux/fortify-string.h | 22 ++++++++++++++++++---- > 1 file changed, 18 insertions(+), 4 deletions(-) > > diff --git a/include/linux/fortify-string.h b/include/linux/fortify-string.h > index 85fc0e6f0f7f..bac010cfc42f 100644 > --- a/include/linux/fortify-string.h > +++ b/include/linux/fortify-string.h > @@ -75,17 +75,30 @@ void __write_overflow_field(size_t avail, size_t wanted) __compiletime_warning(" > __ret; \ > }) > > -#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) > +#if defined(__SANITIZE_ADDRESS__) > + > +#if !defined(CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX) && !defined(CONFIG_GENERIC_ENTRY) > +extern void *__underlying_memset(void *p, int c, __kernel_size_t size) __RENAME(memset); > +extern void *__underlying_memmove(void *p, const void *q, __kernel_size_t size) __RENAME(memmove); > +extern void *__underlying_memcpy(void *p, const void *q, __kernel_size_t size) __RENAME(memcpy); > +#elif defined(CONFIG_KASAN_GENERIC) > +extern void *__underlying_memset(void *p, int c, __kernel_size_t size) __RENAME(__asan_memset); > +extern void *__underlying_memmove(void *p, const void *q, __kernel_size_t size) __RENAME(__asan_memmove); > +extern void *__underlying_memcpy(void *p, const void *q, __kernel_size_t size) __RENAME(__asan_memcpy); > +#else /* CONFIG_KASAN_SW_TAGS */ > +extern void *__underlying_memset(void *p, int c, __kernel_size_t size) __RENAME(__hwasan_memset); > +extern void *__underlying_memmove(void *p, const void *q, __kernel_size_t size) __RENAME(__hwasan_memmove); > +extern void *__underlying_memcpy(void *p, const void *q, __kernel_size_t size) __RENAME(__hwasan_memcpy); > +#endif > + > extern void *__underlying_memchr(const void *p, int c, __kernel_size_t size) __RENAME(memchr); > extern int __underlying_memcmp(const void *p, const void *q, __kernel_size_t size) __RENAME(memcmp); > -extern void *__underlying_memcpy(void *p, const void *q, __kernel_size_t size) __RENAME(memcpy); > -extern void *__underlying_memmove(void *p, const void *q, __kernel_size_t size) __RENAME(memmove); > -extern void *__underlying_memset(void *p, int c, __kernel_size_t size) __RENAME(memset); > extern char *__underlying_strcat(char *p, const char *q) __RENAME(strcat); > extern char *__underlying_strcpy(char *p, const char *q) __RENAME(strcpy); > extern __kernel_size_t __underlying_strlen(const char *p) __RENAME(strlen); > extern char *__underlying_strncat(char *p, const char *q, __kernel_size_t count) __RENAME(strncat); > extern char *__underlying_strncpy(char *p, const char *q, __kernel_size_t size) __RENAME(strncpy); > + > #else > > #if defined(__SANITIZE_MEMORY__) > @@ -110,6 +123,7 @@ extern char *__underlying_strncpy(char *p, const char *q, __kernel_size_t size) > #define __underlying_strlen __builtin_strlen > #define __underlying_strncat __builtin_strncat > #define __underlying_strncpy __builtin_strncpy > + > #endif > > /** > -- > 2.25.1 >