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 5C0BBC02198 for ; Mon, 10 Feb 2025 10:05:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C87726B007B; Mon, 10 Feb 2025 05:05:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C372B6B0083; Mon, 10 Feb 2025 05:05:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AFEBF6B0085; Mon, 10 Feb 2025 05:05:40 -0500 (EST) 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 9322E6B007B for ; Mon, 10 Feb 2025 05:05:40 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1F3FA48C02 for ; Mon, 10 Feb 2025 10:05:40 +0000 (UTC) X-FDA: 83103603240.07.BC0A922 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf14.hostedemail.com (Postfix) with ESMTP id A9979100011 for ; Mon, 10 Feb 2025 10:05:37 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=P0skPLgB; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=br+kPhgb; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="oRTxJ/qZ"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="MNd/v9BC"; spf=pass (imf14.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739181938; a=rsa-sha256; cv=none; b=2Y1j/U2eqUTGALGjtVJhsWku/erqWs9y2NQQ0bAbz0qVAx07HtAYPRD1ztFlnetDJqJtjE ACyo1iBPZKYQcgxz5LSEKBx7yqmpPUV16J9jSm1Dr60XQOZ/oj5phFTGVXRBr58bYu63xe TzcVILXuCUfen7YkBIvGZsczDvuXD30= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=P0skPLgB; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=br+kPhgb; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="oRTxJ/qZ"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="MNd/v9BC"; spf=pass (imf14.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739181938; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=YVnSoIkwfv52XVW57m0P3SMuTTbAAGCE1tva5T3FlZ4=; b=Ybm6aJ40qseC61WBvrJPQl5ujFUd50NF5n+tLEpmiSv6rM5PzOs/+WS9VC1TcDXUnEy9SI 0G1RGx9vtkH3cnP+suPOdqzE2JvgNgoXY0XgevQfKlkMbfFwLEZkgo/88sLmRQk686plWV B1cnsMyYIN4/fGFNeGF2vGtLK7FkxQ8= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D0FF01F38F; Mon, 10 Feb 2025 10:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1739181936; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=YVnSoIkwfv52XVW57m0P3SMuTTbAAGCE1tva5T3FlZ4=; b=P0skPLgByfEvF+nvLzFdKb83b7psUJSalW92rjRY669FcgsozNM6QG6T8NOFnNAAqUuZP0 01YEvOq3Hq1cutiqwNSPDa9yM+OtXAOOwwdIbLQki8PtpS8tifEei0yQq1048fOwfchLCs ctSQjysnxO+BveFqvwBUqkKEFIubw5Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1739181936; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=YVnSoIkwfv52XVW57m0P3SMuTTbAAGCE1tva5T3FlZ4=; b=br+kPhgbpWNzZhEqnp+YiXH1PgxDj7ui5+8zy8159rRNMj8shMhwMRny+CVWcS9Ln5zwj2 yRT7/zU7CQ7FkHAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1739181935; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=YVnSoIkwfv52XVW57m0P3SMuTTbAAGCE1tva5T3FlZ4=; b=oRTxJ/qZ/52dDkc78mdeNgXsCDMWSXsmo7Erpfuqqv8VLDq5lOGNyRknHtQNETk9fstpz2 CBNCTxJnuW2HnlBJODbkHlTPqCi+/EiprbpfxFz+UNO0lRj6rGNouGkAwzNlJBwmUFZS5u xJVGNFovP/zP/lQ2hM/7RfcwryX7IoE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1739181935; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=YVnSoIkwfv52XVW57m0P3SMuTTbAAGCE1tva5T3FlZ4=; b=MNd/v9BCzAxcKBtmCz4x1QIFAseTJtG60SL1TDARzYurgfIZxZKLxipZek3Zd3rNqTTaAp qlwHvPalYVqC+jAQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id A09AE13A62; Mon, 10 Feb 2025 10:05:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id GCmXJm/PqWdsRAAAD6G6ig (envelope-from ); Mon, 10 Feb 2025 10:05:35 +0000 Message-ID: Date: Mon, 10 Feb 2025 11:05:35 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 2/2] slab: Achieve better kmalloc caches randomization in kvmalloc Content-Language: en-US To: GONG Ruiqi , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Kees Cook Cc: Tamas Koczka , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Xiu Jianfeng , linux-mm@kvack.org, linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org References: <20250208014723.1514049-1-gongruiqi1@huawei.com> <20250208014723.1514049-3-gongruiqi1@huawei.com> From: Vlastimil Babka Autocrypt: addr=vbabka@suse.cz; keydata= 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 EP+ylKVEKb0Q2A== In-Reply-To: <20250208014723.1514049-3-gongruiqi1@huawei.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Queue-Id: A9979100011 X-Stat-Signature: edjeqjc3693r8st5b5ztc8bwa4wcnsf7 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739181937-607317 X-HE-Meta: U2FsdGVkX18Z3aUgMsTWeqwRPIDcWc691zgA6LG2aCgzJlJvt3QdgyX596vKB49jLz1NrWsVCerVzmbCp4iZDm4v2DWGfqxV1G4Ja+4cTm70IAg3W+2oEQfqeRUAW7BASHspxoiTJx58EJzNuCA3O6vLgUXpJjzdhwNxFA3nOoGNZu9bZ7j20VKfTLkdsNP/lve7e7Loa+L4TCJYz+2OcZYBHn0bY3k32DuF+mreHg2kB25JfLuhygpGnTE3zyqELBGGr90T1DSHmQpfQL59iyx1RrrxGKVRVMlhwtUnP0tI+hr0rqQWVQ752GSPjtOv65kkYD0Le9hxHar6XULqCkLjOmCymnQf8wG1+niqoPR7wHfnAt4/gMZw2blkgeS4sa6tTEiBA1HcARF/lluEIsLkihgNiAoXVvVpuw1g/3+mn1N4SP74H0dqL7iEKJYEOrBs6KFy8cO5MIXrpr9NqcDBeeLra6+qXZqlkOZhIRTAdGz0+N5Ey+wn7Tt+AKFdMb72+g5UGkEZ0SIvXvzX9kEw5nfrDBMsuQnEEjItOpPBDojk8zIxTSnDo8FAMtzj/njZhiqTcTeGK1NcOfXDaO5FpuZykZ1HmiQTGVzppY7hD7d0h+UAef5ibaTOZPq20B3tJD595DyPNeFxmKRw28C2nMKWk4K9dUzjtJ5mX+Vimvys3zhOqDEMxU+AkOh343k5Ny4p88GmXBSzK/Mp717WSJ9pO4mV+jAM+IPUVG8EzpY6ApIRTWs/fy8peFc5W00GGWv6aYTaFedgCilhiBHNePcRYCdcmLiR0qN/6uDQpw6tIuutPCHwpypZPnwB0a++KNKWBSCuv0f0D3wtYiDnJ8OaFWWjvda7fg/KKTAV267P7IP84DkMkAMOnGrwb3Qgxq5rUFYxzJjNpjueP3SCiGRg57Az6kpQgqWva75uQyyh528uIU+fUMjXxH+guRFmATwtQoj3rDCqvUP te1j6til l6J1XuLQA9S/JrFOG75jg/q8ZwzGcO5GEq8IvSdhkuV58O33K+WAJsU/v87qIE9ub97fkXLJFBzKm/RKOE3TOENBr+OEN9tUvFU82HwliqHbuifHhGTgpthT2mN7HKZgTnSBW3C1TlP8RgRx1ivMNLE14hhpTkm095dthz5ICvKTgkOW+gWcSIXsjanLtlkmxGMSJDvWtUpnqTXIvbc/apQba6kQUvylmktGDc3dtY14eugK5lgf5doxSzZ/lPVUFxmMddqZ5/Poi457BIdakux3G4K0TCBxhaZnW1v0tfG6RAHA61YEsggd4X3KgNByFu32becvOfPuvfq+nHkBVLSqkiU48S+S5WNAiHCTEifUEksFDeKNt4IR3YOx8Z/wRrVOTVSK99bD2plTMKkWqZsmHmTvIJY93BNlOWWB6bWx05djtY4qkaRxK022G0z9F5k3jUvLBpjnfgeY= 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 2/8/25 02:47, GONG Ruiqi wrote: > As revealed by this writeup[1], due to the fact that __kmalloc_node (now > renamed to __kmalloc_node_noprof) is an exported symbol and will never > get inlined, using it in kvmalloc_node (now is __kvmalloc_node_noprof) > would make the RET_IP inside always point to the same address: > > upper_caller > kvmalloc > kvmalloc_node > kvmalloc_node_noprof > __kvmalloc_node_noprof <-- all macros all the way down here > __kmalloc_node_noprof > __do_kmalloc_node(.., _RET_IP_) > ... <-- _RET_IP_ points to > > That literally means all kmalloc invoked via kvmalloc would use the same > seed for cache randomization (CONFIG_RANDOM_KMALLOC_CACHES), which makes > this hardening unfunctional. non-functional? > The root cause of this problem, IMHO, is that using RET_IP only cannot > identify the actual allocation site in case of kmalloc being called > inside wrappers or helper functions. inside non-inlined wrappers... ? > And I believe there could be > similar cases in other functions. Nevertheless, I haven't thought of > any good solution for this. So for now let's solve this specific case > first. Yeah it's the similar problem with shared allocation wrappers as what allocation tagging has. > For __kvmalloc_node_noprof, replace __kmalloc_node_noprof and call > __do_kmalloc_node directly instead, so that RET_IP can take the return > address of kvmalloc and differentiate each kvmalloc invocation: > > upper_caller > kvmalloc > kvmalloc_node > kvmalloc_node_noprof > __kvmalloc_node_noprof <-- all macros all the way down here > __do_kmalloc_node(.., _RET_IP_) > ... <-- _RET_IP_ points to > > Thanks to Tamás Koczka for the report and discussion! > > Link: https://github.com/google/security-research/pull/83/files#diff-1604319b55a48c39a210ee52034ed7ff5b9cdc3d704d2d9e34eb230d19fae235R200 [1] This should be slightly better? A permalink for the file itself: https://github.com/google/security-research/blob/908d59b573960dc0b90adda6f16f7017aca08609/pocs/linux/kernelctf/CVE-2024-27397_mitigation/docs/exploit.md Thanks. > Reported-by: Tamás Koczka > Signed-off-by: GONG Ruiqi > --- > mm/slub.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/mm/slub.c b/mm/slub.c > index 0830894bb92c..46e884b77dca 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -4903,9 +4903,9 @@ void *__kvmalloc_node_noprof(DECL_BUCKET_PARAMS(size, b), gfp_t flags, int node) > * It doesn't really make sense to fallback to vmalloc for sub page > * requests > */ > - ret = __kmalloc_node_noprof(PASS_BUCKET_PARAMS(size, b), > - kmalloc_gfp_adjust(flags, size), > - node); > + ret = __do_kmalloc_node(size, PASS_BUCKET_PARAM(b), > + kmalloc_gfp_adjust(flags, size), > + node, _RET_IP_); > if (ret || size <= PAGE_SIZE) > return ret; >