From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1j3zwn-0006z9-Sz for mharc-grub-devel@gnu.org; Tue, 18 Feb 2020 05:17:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49048) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3zwl-0006rD-N6 for grub-devel@gnu.org; Tue, 18 Feb 2020 05:17:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3zwj-0008Jv-PV for grub-devel@gnu.org; Tue, 18 Feb 2020 05:17:42 -0500 Received: from m9a0014g.houston.softwaregrp.com ([15.124.64.90]:52275) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j3zwj-0008Ij-J5 for grub-devel@gnu.org; Tue, 18 Feb 2020 05:17:41 -0500 Received: FROM m9a0014g.houston.softwaregrp.com (15.121.0.191) BY m9a0014g.houston.softwaregrp.com WITH ESMTP FOR grub-devel@gnu.org; Tue, 18 Feb 2020 10:17:03 +0000 Received: from M4W0334.microfocus.com (2002:f78:1192::f78:1192) by M9W0068.microfocus.com (2002:f79:bf::f79:bf) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Tue, 18 Feb 2020 10:08:34 +0000 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (15.124.8.14) by M4W0334.microfocus.com (15.120.17.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10 via Frontend Transport; Tue, 18 Feb 2020 10:08:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QOubvX3Fj3IWar0E3QHBH0fZxdS9pvTcXwJg1zVjoq6cf1m4zhqqJxaoi9uvFu1oG7QNfWqN5FnWMIoIv27MYx2n2Tv2GBwcZ9wudJMeHWsPpqk1TO6uKDc0lwKy9XzhHjoD48yihlH5ftc+DUCtwFq4Y3RGcZx9GgJ/H/b+b7HR81XxuOqK6XCr/sn55+rcy/hkcemJvedV/3tG16s+/ETVC2zXP9pmAsO5USzv2MQ4qCu4ofZaPI8kXFEWLn/d2lnjJFMK9Jn6uNbKTesbbDwNjb3yOD6hXkZ+Z4bM0Jjk83sf6P4UsQJicpyK1CALiEc3ZiD9skOj8qUSJKGoRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6yairfOqkooTlXcgol5Se6ux4h6T6yQmk9Pi+UrwUEM=; b=KQA2T4GcS6Y+rDbKmmr51oUQu4EXw4bHdjtWvihosRdZOsvhmzxTke8noXHjmONByAp/M+7Zq1Lm9JFxaBvk8X96lKHMx3PIt6/QMtG4ptLuJF3gLTXzZSIUM9so5wzOswaj3w6fE/aprElK4iIF4kiRNp8uQ09IY49v/3kbZ7Z/MAeL+cOz2KSS/x7qcx3fwN3C4CSUx7inMcUl3lhwiCNA9BMVJg92SUh8XFCv7PhAwLA3trtbBIHi5/kawz61YePD+VOT+axqlKC+lfIk1VwEsIvP5lmk8GitEwV5GGycEIlUw1MBVP8xB4vB0BeXmgTF/ljZBvlpQLOMLnK+OA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=MChang@suse.com; Received: from BY5PR18MB3188.namprd18.prod.outlook.com (10.255.138.82) by BY5PR18MB3106.namprd18.prod.outlook.com (10.255.154.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2750.17; Tue, 18 Feb 2020 10:08:31 +0000 Received: from BY5PR18MB3188.namprd18.prod.outlook.com ([fe80::28ac:20e6:d692:e83]) by BY5PR18MB3188.namprd18.prod.outlook.com ([fe80::28ac:20e6:d692:e83%5]) with mapi id 15.20.2729.032; Tue, 18 Feb 2020 10:08:31 +0000 From: Michael Chang To: Subject: [PATCH] verifiers: fix calling uninitialized function pointer Date: Tue, 18 Feb 2020 18:08:18 +0800 Message-ID: <20200218100818.28840-1-mchang@suse.com> X-Mailer: git-send-email 2.16.4 Content-Type: text/plain X-ClientProxiedBy: HKAPR04CA0012.apcprd04.prod.outlook.com (2603:1096:203:d0::22) To BY5PR18MB3188.namprd18.prod.outlook.com (2603:10b6:a03:1ac::18) MIME-Version: 1.0 Received: from linux-9gqx.suse (60.251.47.115) by HKAPR04CA0012.apcprd04.prod.outlook.com (2603:1096:203:d0::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2729.22 via Frontend Transport; Tue, 18 Feb 2020 10:08:30 +0000 X-Mailer: git-send-email 2.16.4 X-Originating-IP: [60.251.47.115] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07782d57-b639-4fff-354f-08d7b45a8174 X-MS-TrafficTypeDiagnostic: BY5PR18MB3106: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 031763BCAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4636009)(366004)(396003)(346002)(376002)(136003)(39860400002)(189003)(199004)(316002)(66946007)(6666004)(66476007)(66556008)(36756003)(55236004)(6506007)(8886007)(478600001)(86362001)(6916009)(2906002)(52116002)(8676002)(8936002)(81166006)(81156014)(6512007)(6486002)(26005)(186003)(16526019)(1076003)(5660300002)(2616005)(956004); DIR:OUT; SFP:1102; SCL:1; SRVR:BY5PR18MB3106; H:BY5PR18MB3188.namprd18.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: suse.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tbRHMHiJSLzjo95cG754Jxq7lux8Ymi25YnQxEkjY1qoODOcQ84/LFf95V2iEY1DNf38GRHJqCEaU0l71VGK5uqI3lZRZQCbXyg5xsjh7rdrrst1ex0czkGom88FtM5eVQecXB5juFqcG6Y+WKCA/lArERmLaHvx81inmse+ki7+XODizERLMTm5MA2Sua65MeITnC/ZXgMNYM1djXIpNbdcigxQitZpcJ+sx+3yOGtKptSUnjmsC0j/7tNogVX0GfWMGefRXkoTgHFTYzfiBqYunbvMdyamW+lKR1RS4rBZiRogek/UfxJdnvgK4sTFqiG+NTkifEbSyrk88JhR53PP0H5zMS/NsnNIdve9hG+wcu3Au/5Q2RCP876Nyn/0lVT4h7vg8R2MV/+OOZ8oOktVfVwuOYSAGxB1QWpkZkatDq9m4XABTWncZqw2iaxh X-MS-Exchange-AntiSpam-MessageData: jA6b6jaHIhWUBS1SaK9+IdrTKMT+lKn8cS84HHFRjuMyqB9fQFbqjmNJoedJlY6v2XLA7Y+ux6n8W8Pp5y+iAHoEwGAQxLwNvAvJZXzZD331QQUvGQr97RpkzyiPSaJEoqKm94jnph4WqOz+pnSYxQ== X-MS-Exchange-CrossTenant-Network-Message-Id: 07782d57-b639-4fff-354f-08d7b45a8174 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2020 10:08:31.2564 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 856b813c-16e5-49a5-85ec-6f081e13b527 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fGGhFGymJgkZuA8EOv5jqrYDvujO7wFlE+cDkVZm335wouZw14leYBJDKtGgbI6E X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR18MB3106 X-OriginatorOrg: suse.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 15.124.64.90 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Feb 2020 10:17:45 -0000 The necessary check for null before use of function ver->close is not taking place in the failure path. This patch simply adds the missing check and fixes the problem that grub hangs indefinitely after booting rogue image without valid signature if secure boot turned on. Now it displays like this for booting rogue uefi image. error: bad shim signature error: you need to load the kernel first Press any key to continue... and then you can go back to boot menu by pressing any key or after a few seconds expired. Signed-off-by: Michael Chang --- grub-core/commands/verifiers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/grub-core/commands/verifiers.c b/grub-core/commands/verifiers.c index 0dde48182..7b9297cd3 100644 --- a/grub-core/commands/verifiers.c +++ b/grub-core/commands/verifiers.c @@ -196,7 +196,8 @@ grub_verifiers_open (grub_file_t io, enum grub_file_type type) return ret; fail: - ver->close (context); + if (ver->close) + ver->close (context); fail_noclose: verified_free (verified); grub_free (ret); -- 2.16.4