From patchwork Mon Jul 19 14:50:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 479984 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4255372jao; Mon, 19 Jul 2021 08:54:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhTtuxHxHhu77/j5THgW0oXsVA2EjJbgTEWAnppSn4fSybD+SqrKMkd5DzC9APWfmZ/H8w X-Received: by 2002:aa7:dc0c:: with SMTP id b12mr35245555edu.105.1626710059276; Mon, 19 Jul 2021 08:54:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626710059; cv=none; d=google.com; s=arc-20160816; b=pXxYeoUAZeLDjSbanVVY8fkuw6iGKDGW4/SCmTOcDvAZBw0LevRvRtYquA+HRE8twt moB+TDJfqFUZe2AD2zG+pgHdoDK24QkJDE1wHXfmskMs0KEOssjzp4jdqtNqFWVR426n Z8QMUvk1xKHEZcdWIYugIVApZN1p8eiS6mdYMP7qqk/sgoiQ6Rvew1EPnVBAhSqScRXC uJmo/5xemEnxr2uf11+mJwziK67Lo4nmwy9XAr+Gm4LNzT3eFd8OQrOCqeP2W3MDpvW1 EcO67vno9i6clAAs6Fe00W4KcJZTHEuA6HL05MlMHKf22ioBXfJcCafHPTyvsbA/kddq kszw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=97UEc/mCT45/SNTqjnXO43/nsZqZI5g6BXq4EfZhWAg=; b=Y0v5qGXLRuuIWIQjQ8HZfkWf/FETY60Jx1w1tTGg3FBhddPxcIFUlN9xgTN0rakqYd 4DorJBxKDMEdEh3fL9DiwCaqp3vjvVDo5Y/tNuZdqzyg+MenFLDhm1tkpX/vCakkHA+M ORRoiAv3OVI2db8nt5OA28SeKt7ZbFxwm3y2SLJ9pCMxNJPNWmnFGh3GHgdhAkjZV6oZ m4y14e9TcTEvtmrF9SxVNUm+Kqyy3Uu5Ao6Y2ER3Yi4LrryO4at4Ta0PiQqjI41jYDGG Y1l6cYaaZFTLLIRBekPh4TF6evAXyBR49ePR4sTomlklB2eQ6I09JUlY/PWuQjOoJhpj PAYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Qmg5H/HC"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l1si24467653ejo.68.2021.07.19.08.54.19; Mon, 19 Jul 2021 08:54:19 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Qmg5H/HC"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346068AbhGSPNg (ORCPT + 12 others); Mon, 19 Jul 2021 11:13:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:48156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345592AbhGSPMF (ORCPT ); Mon, 19 Jul 2021 11:12:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 215CA61249; Mon, 19 Jul 2021 15:52:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709951; bh=s8qxXTQl66UCi8CW5gBxbUGTEfvj080RXKdnY+bWkSg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qmg5H/HCnj3n7FhW9oiWn2tUfxLghlJfuWFss/tZ7u9jfARr3F4KptiJ5TGmbzmr3 DL5gStnwGotQmM1RLViqzYx+VEy6i9ICRfoECpiFbqpGS3FNx5Gfsr5v3kVkKNxTb+ rVgFfUMFlNmi0g3vO8Qf2p97f9Dt2VZHyCLGTRMU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhen Lei , Daniel Vetter Subject: [PATCH 5.10 014/243] fbmem: Do not delete the mode that is still in use Date: Mon, 19 Jul 2021 16:50:43 +0200 Message-Id: <20210719144941.381524645@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144940.904087935@linuxfoundation.org> References: <20210719144940.904087935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei commit 0af778269a522c988ef0b4188556aba97fb420cc upstream. The execution of fb_delete_videomode() is not based on the result of the previous fbcon_mode_deleted(). As a result, the mode is directly deleted, regardless of whether it is still in use, which may cause UAF. ================================================================== BUG: KASAN: use-after-free in fb_mode_is_equal+0x36e/0x5e0 \ drivers/video/fbdev/core/modedb.c:924 Read of size 4 at addr ffff88807e0ddb1c by task syz-executor.0/18962 CPU: 2 PID: 18962 Comm: syz-executor.0 Not tainted 5.10.45-rc1+ #3 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ... Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x137/0x1be lib/dump_stack.c:118 print_address_description+0x6c/0x640 mm/kasan/report.c:385 __kasan_report mm/kasan/report.c:545 [inline] kasan_report+0x13d/0x1e0 mm/kasan/report.c:562 fb_mode_is_equal+0x36e/0x5e0 drivers/video/fbdev/core/modedb.c:924 fbcon_mode_deleted+0x16a/0x220 drivers/video/fbdev/core/fbcon.c:2746 fb_set_var+0x1e1/0xdb0 drivers/video/fbdev/core/fbmem.c:975 do_fb_ioctl+0x4d9/0x6e0 drivers/video/fbdev/core/fbmem.c:1108 vfs_ioctl fs/ioctl.c:48 [inline] __do_sys_ioctl fs/ioctl.c:753 [inline] __se_sys_ioctl+0xfb/0x170 fs/ioctl.c:739 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Freed by task 18960: kasan_save_stack mm/kasan/common.c:48 [inline] kasan_set_track+0x3d/0x70 mm/kasan/common.c:56 kasan_set_free_info+0x17/0x30 mm/kasan/generic.c:355 __kasan_slab_free+0x108/0x140 mm/kasan/common.c:422 slab_free_hook mm/slub.c:1541 [inline] slab_free_freelist_hook+0xd6/0x1a0 mm/slub.c:1574 slab_free mm/slub.c:3139 [inline] kfree+0xca/0x3d0 mm/slub.c:4121 fb_delete_videomode+0x56a/0x820 drivers/video/fbdev/core/modedb.c:1104 fb_set_var+0x1f3/0xdb0 drivers/video/fbdev/core/fbmem.c:978 do_fb_ioctl+0x4d9/0x6e0 drivers/video/fbdev/core/fbmem.c:1108 vfs_ioctl fs/ioctl.c:48 [inline] __do_sys_ioctl fs/ioctl.c:753 [inline] __se_sys_ioctl+0xfb/0x170 fs/ioctl.c:739 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Fixes: 13ff178ccd6d ("fbcon: Call fbcon_mode_deleted/new_modelist directly") Signed-off-by: Zhen Lei Cc: # v5.3+ Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20210712085544.2828-1-thunder.leizhen@huawei.com Signed-off-by: Greg Kroah-Hartman --- drivers/video/fbdev/core/fbmem.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -970,13 +970,11 @@ fb_set_var(struct fb_info *info, struct fb_var_to_videomode(&mode2, &info->var); /* make sure we don't delete the videomode of current var */ ret = fb_mode_is_equal(&mode1, &mode2); - - if (!ret) - fbcon_mode_deleted(info, &mode1); - - if (!ret) - fb_delete_videomode(&mode1, &info->modelist); - + if (!ret) { + ret = fbcon_mode_deleted(info, &mode1); + if (!ret) + fb_delete_videomode(&mode1, &info->modelist); + } return ret ? -EINVAL : 0; }