Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <66e25026-a86a-0157-3671-cf66eb53964c@suse.cz>
Date:   Tue, 23 Aug 2022 17:12:01 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.1.2
Subject: Re: [PATCH v4 17/17] mm/sl[au]b: check if large object is valid in
 __ksize()
Content-Language: en-US
To:     Hyeonggon Yoo <42.hyeyoo@gmail.com>,
        Christoph Lameter <cl@linux.com>,
        Pekka Enberg <penberg@kernel.org>,
        David Rientjes <rientjes@google.com>,
        Joonsoo Kim <iamjoonsoo.kim@lge.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Roman Gushchin <roman.gushchin@linux.dev>
Cc:     linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        Marco Elver <elver@google.com>
References: <20220817101826.236819-1-42.hyeyoo@gmail.com>
 <20220817101826.236819-18-42.hyeyoo@gmail.com>
From:   Vlastimil Babka <vbabka@suse.cz>
In-Reply-To: <20220817101826.236819-18-42.hyeyoo@gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 8/17/22 12:18, Hyeonggon Yoo wrote:
> If address of large object is not beginning of folio or size of
> the folio is too small, it must be invalid. BUG() in such cases.
> 
> Cc: Marco Elver <elver@google.com>
> Suggested-by: Vlastimil Babka <vbabka@suse.cz>
> Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
> Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
> ---
>  mm/slab_common.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/mm/slab_common.c b/mm/slab_common.c
> index 9c273a5fb0d7..98d029212682 100644
> --- a/mm/slab_common.c
> +++ b/mm/slab_common.c
> @@ -984,8 +984,11 @@ size_t __ksize(const void *object)
>  
>  	folio = virt_to_folio(object);
>  
> -	if (unlikely(!folio_test_slab(folio)))
> +	if (unlikely(!folio_test_slab(folio))) {
> +		BUG_ON(folio_size(folio) <= KMALLOC_MAX_CACHE_SIZE);
> +		BUG_ON(object != folio_address(folio));
>  		return folio_size(folio);
> +	}
>  
>  	return slab_ksize(folio_slab(folio)->slab_cache);
>  }

In light of latest Linus' rant on BUG_ON() [1] I'm changing it to WARN_ON
and return 0, as it was in v3.

[1] https://lore.kernel.org/all/CAHk-=wiEAH+ojSpAgx_Ep=NKPWHU8AdO3V56BXcCsU97oYJ1EA@mail.gmail.com/


diff --git a/mm/slab_common.c b/mm/slab_common.c
index 98d029212682..a80c3a5e194d 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -985,8 +985,10 @@ size_t __ksize(const void *object)
 	folio = virt_to_folio(object);
 
 	if (unlikely(!folio_test_slab(folio))) {
-		BUG_ON(folio_size(folio) <= KMALLOC_MAX_CACHE_SIZE);
-		BUG_ON(object != folio_address(folio));
+		if (WARN_ON(folio_size(folio) <= KMALLOC_MAX_CACHE_SIZE))
+			return 0;
+		if (WARN_ON(object != folio_address(folio)))
+			return 0;
 		return folio_size(folio);
 	}