Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
Date:   Thu, 23 Nov 2023 20:39:30 +0800
From:   Feng Tang <feng.tang@intel.com>
To:     "andrey.konovalov@linux.dev" <andrey.konovalov@linux.dev>
CC:     Andrew Morton <akpm@linux-foundation.org>,
        Andrey Konovalov <andreyknvl@gmail.com>,
        Marco Elver <elver@google.com>,
        Alexander Potapenko <glider@google.com>,
        Dmitry Vyukov <dvyukov@google.com>,
        Vlastimil Babka <vbabka@suse.cz>,
        "kasan-dev@googlegroups.com" <kasan-dev@googlegroups.com>,
        Evgenii Stepanov <eugenis@google.com>,
        Oscar Salvador <osalvador@suse.de>,
        Hyeonggon Yoo <42.hyeyoo@gmail.com>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrey Konovalov <andreyknvl@google.com>
Subject: Re: [PATCH mm] slub, kasan: improve interaction of KASAN and
 slub_debug poisoning
Message-ID: <ZV9IAnfUHq2lcCe0@feng-clx>
References: <20231122231202.121277-1-andrey.konovalov@linux.dev>
 <ZV7whSufeIqslzzN@feng-clx>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <ZV7whSufeIqslzzN@feng-clx>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?p0/3s+uEmCwMptg4Y3FmCs4UF4jdFibYOxcpV2RGFttG6EoRPIuJHqM0/xLW?=
 =?us-ascii?Q?AkxwWPcxY7czfoSAUsSVu4D+ad0uSc1Bx/KnQKk+KF6l+bWyP44a5ZcFOgLF?=
 =?us-ascii?Q?mQ0JM8U7gUP5qI8jrhSyd0L7Vsy7uPk3Gz1zKENABo8Ztiae9phXr/U3tgI6?=
 =?us-ascii?Q?i7SGQB2IApLlsuVnwvk+yhP21FBBsutPIFAKIHHB8dOXQpjezHRTCLJw6T62?=
 =?us-ascii?Q?M9DaBqrnO5DNFSGkPMZw+6A13QJinaX3BulvDIJnbtlXlLVdpcdPOx6l0YSs?=
 =?us-ascii?Q?TKcE7Y/XYjdsyINhoTQ+HLzOuV2CNyie3jkSAs7X1e7Uw2XaaANMFHb8ttMw?=
 =?us-ascii?Q?/hhk6XaSA0CAy/1rfS2+adcv60qmuh9j3o8vigWYj2RR9vA9vpXTHD3gg49X?=
 =?us-ascii?Q?ylnMG1eq9O1k1hyrkC8Dq0CRMBj5Nzq4+B/ZojdnGWhAzEli4fdjSQvSBzJn?=
 =?us-ascii?Q?uy0q/dXaQ6XIy7NO73h1AWuOEFCBzFdfW6OC47yvUiLoEy9VooajoCFU679W?=
 =?us-ascii?Q?yHTukVRuRFRPql7I2k8sFdLBOR5snQGul+09FUPrtGaN6QPOVEUnRa0VFgXp?=
 =?us-ascii?Q?t6xo+g51H9E5uuQqbrOS9deJx6f/IIAgnscAuOg1++WoBWEF3UpxaS4tXmNj?=
 =?us-ascii?Q?YA/FRTzD25p2cVARLem+4jcOKykl7PpOpFcJ8a5+Y/HuVjk0V/kFQcpYynGm?=
 =?us-ascii?Q?ktFOC4BNQkdW+lFkBEfPNxm11awuNiH+Hk0ofGP/df+Xp4ZtvlPDnRVQF7m5?=
 =?us-ascii?Q?0EX4yLmD98vKiHzjviDIZ+X2IcbaXUQXIOyytXJBZi5nDv41HfL31HUccUnI?=
 =?us-ascii?Q?te8/mmEh4b2cYfKPcF/UNE94X3Z8G6k3pzZZzsuGbnUKiTeM0zCe/hUHWlbi?=
 =?us-ascii?Q?dahEMNJcYQ5y7baPFHgP7EArUb3XRcm9n57XvGIQbbE7BLz4CrWE1o+ZIZCG?=
 =?us-ascii?Q?AM7uM3pnvjlqi79Oy8mch8lVtdKnHtWvU/iuBr48RgN2z4thsr5jO9qY57eq?=
 =?us-ascii?Q?ZOdkQecDnHdhCY4obXcTyo7X4WtuiyCiYMMm2f7gg3vK2FXfuCeIJvAdf6q+?=
 =?us-ascii?Q?KxRwEncJOyf37awS1GrJmzGWiQrut8UF7/GqixxKisDNEXnCD72RRTqnvdJv?=
 =?us-ascii?Q?IZnLFCa+iXDtt+WnfONkyA/tqFYY//qWVp9VUZzAUQanPAqtn4ibrVvEu1yN?=
 =?us-ascii?Q?59TLWmn0ARwf8jTpPgm4/v+For9rChDxrbIRnxPzSINdf1cpf8g6tcrhKMs7?=
 =?us-ascii?Q?KMHmHkveqIfZcc2o/xnY52l5Am5Fobd8m3P2bLAKSfjPW0lONJsrU1lnqXj2?=
 =?us-ascii?Q?FYC1edK1s5NNPgHNC9VnyeiBZWFNn7QlUYnXIaE0PtmZ1OjcyzOqNwxd1uU4?=
 =?us-ascii?Q?gojNP5rcucqJ3DESpwUp4r5Ic1BgFI9lg4Ya1BPRsgRjJT2UZQacOV01yVQO?=
 =?us-ascii?Q?15DyR8LDQ1+6CLDZg2co3ck/Y70Oz8PdFmP8+iOJ0/WYZApQnLjgmHXk+XJH?=
 =?us-ascii?Q?HqLi1nzjZjx/IHjF4ONy7duDFU9AIBJ+rsnBcdncZeanvJCs4AIzDmEX38S+?=
 =?us-ascii?Q?KIYU10lZPTV6sE8TECutYDIyea5L7FI6zTLAHi0P?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 790529ed-0d5e-4f9d-3edc-08dbec2280ed
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6304.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2023 12:48:34.0126
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Ic6gl0OU6Nh8yTS2RY3TukxRJJ4WWx1ql6w03oV4L1g7ikitQdPHpNNxlL0TZvOQchC3nhsg0057yLf0qZf3DA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6882
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Thu, 23 Nov 2023 04:49:01 -0800 (PST)

On Thu, Nov 23, 2023 at 02:26:13PM +0800, Tang, Feng wrote:
[...]
> > -#ifdef CONFIG_KASAN_GENERIC
> >  	/*
> > -	 * KASAN could save its free meta data in object's data area at
> > -	 * offset 0, if the size is larger than 'orig_size', it will
> > -	 * overlap the data redzone in [orig_size+1, object_size], and
> > -	 * the check should be skipped.
> > +	 * KASAN can save its free meta data inside of the object at offset 0.
> > +	 * If this meta data size is larger than 'orig_size', it will overlap
> > +	 * the data redzone in [orig_size+1, object_size]. Thus, we adjust
> > +	 * 'orig_size' to be as at least as big as KASAN's meta data.
> >  	 */
> > -	if (kasan_metadata_size(s, true) > orig_size)
> > -		orig_size = s->object_size;
> > -#endif
> > +	kasan_meta_size = kasan_metadata_size(s, true);
> > +	if (kasan_meta_size > orig_size)
> > +		orig_size = kasan_meta_size;
> 
> 'orig_size' is to save the orignal request size for kmalloc object,
> and its main purpose is to detect the memory wastage of kmalloc
> objects, see commit 6edf2576a6cc "mm/slub: enable debugging memory
> wasting of kmalloc"
> 
> Setting "orig_size = s->object_size" was to skip the wastage check
> and the redzone sanity check for this 'wasted space'.
> 
> So it's better not to set 'kasan_meta_size' to orig_size.
> 
> And from the below code, IIUC, the orig_size is not used in fixing
> the boot problem found by Hyeonggon?

I just tried Hyeonggon's reproducing method [1], and confirmed the
below change of check_object() itself can fix the problem.

[1]. https://lore.kernel.org/lkml/CAB=+i9RnOz0jDockOfw3oNageCUF5gmF+nzOzPpoTxtr7eqn7g@mail.gmail.com/

Thanks,
Feng

> 
> Thanks,
> Feng
> 
> >  
> >  	p += get_info_end(s);
> >  	p += sizeof(struct track) * 2;
> > @@ -1192,7 +1192,7 @@ static int check_object(struct kmem_cache *s, struct slab *slab,
> >  {
> >  	u8 *p = object;
> >  	u8 *endobject = object + s->object_size;
> > -	unsigned int orig_size;
> > +	unsigned int orig_size, kasan_meta_size;
> >  
> >  	if (s->flags & SLAB_RED_ZONE) {
> >  		if (!check_bytes_and_report(s, slab, object, "Left Redzone",
> > @@ -1222,12 +1222,23 @@ static int check_object(struct kmem_cache *s, struct slab *slab,
> >  	}
> >  
> >  	if (s->flags & SLAB_POISON) {
> > -		if (val != SLUB_RED_ACTIVE && (s->flags & __OBJECT_POISON) &&
> > -			(!check_bytes_and_report(s, slab, p, "Poison", p,
> > -					POISON_FREE, s->object_size - 1) ||
> > -			 !check_bytes_and_report(s, slab, p, "End Poison",
> > -				p + s->object_size - 1, POISON_END, 1)))
> > -			return 0;
> > +		if (val != SLUB_RED_ACTIVE && (s->flags & __OBJECT_POISON)) {
> > +			/*
> > +			 * KASAN can save its free meta data inside of the
> > +			 * object at offset 0. Thus, skip checking the part of
> > +			 * the redzone that overlaps with the meta data.
> > +			 */
> > +			kasan_meta_size = kasan_metadata_size(s, true);
> > +			if (kasan_meta_size < s->object_size - 1 &&
> > +			    !check_bytes_and_report(s, slab, p, "Poison",
> > +					p + kasan_meta_size, POISON_FREE,
> > +					s->object_size - kasan_meta_size - 1))
> > +				return 0;
> > +			if (kasan_meta_size < s->object_size &&
> > +			    !check_bytes_and_report(s, slab, p, "End Poison",
> > +					p + s->object_size - 1, POISON_END, 1))
> > +				return 0;
> > +		}
> >  		/*
> >  		 * check_pad_bytes cleans up on its own.
> >  		 */
> > -- 
> > 2.25.1
> >