Received: by 2002:ab2:1689:0:b0:1f7:5705:b850 with SMTP id d9csp1400474lqa; Mon, 29 Apr 2024 07:33:22 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVgyT49q+W75p09pSRwylYwXNY/KkbuOoO55n+Gv8yyZtcqoHwfWXRHRdQwUINz7DmFCiX+0+dbLU2vLbTdMLQ6g6UaRO1K82Cqd1u5uw== X-Google-Smtp-Source: AGHT+IGjmKaSlbykrI8EjQgvB6ICzswABetZLZz1JlZRPOup7i6Wytb83zuudI4c1a1vDIBdSFWG X-Received: by 2002:a50:8d42:0:b0:571:be3a:e904 with SMTP id t2-20020a508d42000000b00571be3ae904mr7001007edt.8.1714401202639; Mon, 29 Apr 2024 07:33:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714401202; cv=pass; d=google.com; s=arc-20160816; b=mUyYxxgYCu/6MXIoLTVBZyYHelX7TU5pjbCYTTfKN9wX3apDQB/8G03Aah5zbdcKk9 VyftHdr4H1b7gNl/xpTsf8R97da78yNVWK1V+njUpF57i6/XGZjddqDd55iODxKLuj3w foPKGk2tiS07ADZ+FhWpvv8m6nILE2Rd4W5lSp7sx5cGHcv5ZtZcr4V6jgpDe1QKP86d EStSTeQuStk0Rqr7JWj1ZnackjKe+hyCzhc6o+n9gIOswq54Z7ZIxWE7LCDS3q/9pXuY Ufpt62OdBLyK5GSvvJXkO/+fSy4ryRRe83YrLRXnRB0TWm10i4WO/cxFtmhsH9cXt9mb LFpw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id:dkim-signature; bh=YBV4e+LFdx37RYtGfNqESt5nooG6GvmSE7HSLDnWTtY=; fh=1g6lDt14lAvqvGztdBZkNv420KrdMSB9KhcryCa0pto=; b=O8071iMD9M3vIguLkBKTF49bXAH30pGRO3OXBdxFh+OVgchemIt/luWtE4RTZOJ6fS Pch38X+f872j05yqpYwboz/DfsOjcGArDsMRTfDR/2vP0NvOrmMrk4bZQoIWn8uwDW3w dUGGD7J7iTdbaiXJy5zWdL+2nf3F/8oHFp/djoVCuOnsvCAp2ZYJyFF7xx7mffK6dpq7 OhXSxT8ZuFfakXfVYxfsh+CIzFUgv8faAB6da9SyS7Dqwy4Z2lytewr+FlyNNB+jrvw1 REOv/NqKCacCIH2iKwxcXJIX/TgLbDSsY9/zdQNQDE4Ks48CLeVkv9fnLnslKioDlwIH Thhw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@clip-os.org header.s=gm1 header.b=Q6HQ1p1I; arc=pass (i=1 spf=pass spfdomain=clip-os.org dkim=pass dkdomain=clip-os.org dmarc=pass fromdomain=clip-os.org); spf=pass (google.com: domain of linux-kernel+bounces-162447-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-162447-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=clip-os.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id u16-20020a056402111000b00571b9aba848si13791740edv.566.2024.04.29.07.33.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 07:33:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-162447-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@clip-os.org header.s=gm1 header.b=Q6HQ1p1I; arc=pass (i=1 spf=pass spfdomain=clip-os.org dkim=pass dkdomain=clip-os.org dmarc=pass fromdomain=clip-os.org); spf=pass (google.com: domain of linux-kernel+bounces-162447-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-162447-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=clip-os.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 23C641F22520 for ; Mon, 29 Apr 2024 14:33:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 085087D07A; Mon, 29 Apr 2024 14:33:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=clip-os.org header.i=@clip-os.org header.b="Q6HQ1p1I" Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91036947B for ; Mon, 29 Apr 2024 14:33:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401183; cv=none; b=a5U1Bl/n7go7P8ivUYw0/qr0L8CENmZi0HpCVlJOXhnRI5t/2gmzPqYfn/V/Tl1u/F4pc2zEAzlEsyfR0fwhdWAgk8PVlnAILpI5ff1CRvKKXVxbYf76Knk+yYMvQosu8ExcWzdrPyYg7FOI9D3LSihtNvBltkZFVWkOfzAgt2E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714401183; c=relaxed/simple; bh=0r2NyCdx1TeizivsPN3qPbB0U1T8XEjNCisH5lQX+4M=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=PTXMi+v/q3wZNXGx37TuUFAIRBSGhQdVQwUuXKwW1Di8nONF5yN7gAHOSqF0RLabKbi/rV79Vda2FFEat6zSgbIBr1gL7BOibKRsUpXlghRCxCMbt6pO68E+4XJwf4zS14gvw2NqeOjiF5W8rjHQ8hj815Lsu1oVLfOkIR1w6xw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=clip-os.org; spf=pass smtp.mailfrom=clip-os.org; dkim=pass (2048-bit key) header.d=clip-os.org header.i=@clip-os.org header.b=Q6HQ1p1I; arc=none smtp.client-ip=217.70.183.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=clip-os.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=clip-os.org Received: by mail.gandi.net (Postfix) with ESMTPSA id 355FFFF807; Mon, 29 Apr 2024 14:32:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=clip-os.org; s=gm1; t=1714401172; h=from:from: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; bh=YBV4e+LFdx37RYtGfNqESt5nooG6GvmSE7HSLDnWTtY=; b=Q6HQ1p1IcoAdNvsrwUpy4LMQvqouNAZvU3e/nvQY47GKEznrvvc2NjXNZwYE8FyxmSRsvs IuWfklj/bpwjmFbxG6N5RvYy883tdwYRNIe0kBDbJvx/A1dHDcRYskM2US2R0leth8SINp Uzo+dXcHB+C/qt8FHA3flRCSEj2o66DUYqO5IAsCl16ZRulGAsl2CSBHKtuqufisN9qbEv uV5ReAyblY6CQsPR9nOuCg/yyzpst6rx4FKRNcvP8HUdYiWaanzLmTz70c530mA6213ru9 lfqME37otCQ6qkU8OhJs11FBsVKDCdk344sbamAr+iG8PeCMLOzafTVS5gMyUg== Message-ID: <83fda406-0340-4b7b-9f02-e9eb41c77f0e@clip-os.org> Date: Mon, 29 Apr 2024 16:32:49 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] slub: Fixes freepointer encoding for single free To: Chengming Zhou , Vlastimil Babka , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, roman.gushchin@linux.dev, 42.hyeyoo@gmail.com, Xiongwei Song References: <5c34b253-b476-494a-96c9-fe3c95b9b74d@linux.dev> <6f977874-2a18-44ef-b207-9eb0baad9d66@suse.cz> <7074c0b4-62d4-444d-8e59-e23bbbccf9b8@clip-os.org> Content-Language: en-US From: Nicolas Bouchinet In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-GND-Sasl: nicolas.bouchinet@clip-os.org On 4/29/24 15:35, Chengming Zhou wrote: > On 2024/4/29 20:59, Nicolas Bouchinet wrote: >> On 4/29/24 11:09, Nicolas Bouchinet wrote: >>> Hi Vlastimil, >>> >>> thanks for your review and your proposal. >>> >>> On 4/29/24 10:52, Vlastimil Babka wrote: >>>> On 4/25/24 5:14 PM, Chengming Zhou wrote: >>>>> On 2024/4/25 23:02, Nicolas Bouchinet wrote: >>>> Thanks for finding the bug and the fix! >>>> >>>>>> Hy, >>>>>> >>>>>> First of all, thanks a lot for your time. >>>>>> >>>>>> On 4/25/24 10:36, Chengming Zhou wrote: >>>>>>> On 2024/4/24 20:47, Nicolas Bouchinet wrote: >>>>>>>> From: Nicolas Bouchinet >>>>>>>> >>>>>>>> Commit 284f17ac13fe ("mm/slub: handle bulk and single object freeing >>>>>>>> separately") splits single and bulk object freeing in two functions >>>>>>>> slab_free() and slab_free_bulk() which leads slab_free() to call >>>>>>>> slab_free_hook() directly instead of slab_free_freelist_hook(). >>>>>>> Right. >>>>>>> y not suitable for a stable-candidate fix we need >>>>>>>> If `init_on_free` is set, slab_free_hook() zeroes the object. >>>>>>>> Afterward, if `slub_debug=F` and `CONFIG_SLAB_FREELIST_HARDENED` are >>>>>>>> set, the do_slab_free() slowpath executes freelist consistency >>>>>>>> checks and try to decode a zeroed freepointer which leads to a >>>>>>>> "Freepointer corrupt" detection in check_object(). >>>>>>> IIUC, the "freepointer" can be checked on the free path only when >>>>>>> it's outside the object memory. Here slab_free_hook() zeroed the >>>>>>> freepointer and caused the problem. >>>>>>> >>>>>>> But why we should zero the memory outside the object_size? It seems >>>>>>> more reasonable to only zero the object_size when init_on_free is set? >>>>>> The original purpose was to avoid leaking information through the object and its metadata / tracking information as described in init_on_free initial Commit 6471384af2a6 ("mm: security: introduce init_on_alloc=1 and init_on_free=1 boot options"). >>>>>> >>>>>> I have to admit I didn't read the entire lore about the original patchset yet, though it could be interesting to know a bit more the threat models, specifically regarding the object metadata init. >>>>> Thank you for the reference! I also don't get why it needs to zero >>>>> the metadata and tracking information. >>>> Hmm taking a step back, it seems really suboptimal to initialize the >>>> outside-object freepointer as part of init_on_free: >>>> >>>> - the freeing itself will always set it one way or another, in this case >>>> free_to_partial_list() will do set_freepointer() after free_debug_processing() >>>> >>>> - we lose the ability to detect if the allocated slab object's user wrote to >>>> it, which is a buffer overflow > Ah, right, this ability seems important for debugging overflow problem. > >>>> So the best option to me would be to adjust the init in slab_free_hook() to >>>> avoid the outside-object freepointer similarly to how it avoids the red zone. > Agree. > >>>> We'll still not have the buffer overflow detection ability for bulk free >>>> where slab_free_freelist_hook() will set the free pointer before we reach >>>> the checks, but changing that is most likely not worth the trouble, and >>>> especially not suitable for a stable-candidate fix we need here. >>> It seems like a good alternative to me, I'll push a V2 patch with those changes. >>> >>> I help maintaining the Linux-Hardened patchset in which we have a slab object canary feature that helps detecting overflows. It is located just after the object freepointer. >> >> I've tried a patch where the freepointer is avoided but it results in the same bug. It seems that the commit 0f181f9fbea8bc7ea ("mm/slub.c: init_on_free=1 should wipe freelist ptr for bulk allocations") inits the freepointer on allocation if init_on_free is set in order to return a clean initialized object to the caller. >> > Good catch! You may need to change maybe_wipe_obj_freeptr() too, > I haven't tested this, not sure whether it works for you. :) > > diff --git a/mm/slub.c b/mm/slub.c > index 3e33ff900d35..3f250a167cb5 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -3796,7 +3796,8 @@ static void *__slab_alloc_node(struct kmem_cache *s, > static __always_inline void maybe_wipe_obj_freeptr(struct kmem_cache *s, > void *obj) > { > - if (unlikely(slab_want_init_on_free(s)) && obj) > + if (unlikely(slab_want_init_on_free(s)) && obj && > + !freeptr_outside_object(s)) > memset((void *)((char *)kasan_reset_tag(obj) + s->offset), > 0, sizeof(void *)); > } > > Thanks! Indeed since check_object() avoids objects for which freepointer is in the object and since val is equal to SLUB_RED_ACTIVE in our specific case it should work. Do you want me to add you as Co-authored ? Best regards, Nicolas