From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lH9MY-00026B-Nh for mharc-grub-devel@gnu.org; Tue, 02 Mar 2021 13:03:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH9MU-0001ux-LT for grub-devel@gnu.org; Tue, 02 Mar 2021 13:03:10 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:40602) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH9ML-0008ML-0M for grub-devel@gnu.org; Tue, 02 Mar 2021 13:03:10 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 122HwpaA176868 for ; Tue, 2 Mar 2021 18:02:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-type : mime-version; s=corp-2020-01-29; bh=skTeC2a341Sx8zXEwnG5YPi0yGiLZ7wTmMw4eYjURp8=; b=Ji6e8LDtWtQpFO758Mbtqr5GM2C/YcLVIiNTWuLxDdrds8k2328MpE3wCTQKv9kTqF1h BxFc+e1IzHn7Ma6YADDOv4Xul9U10rvQosNN4Rk3uBVspTmz1I7KqHyPE1jxzUnPgqCu EXlNcopvfE6jvTdwe+d7y3T8IMID1R+hKqL4mJBrlOCUQLHhzgoJYb3OT5/7jar8GhMp 2Ur/NpzANIqxLWVmJU6scVonXjVeDvUvfEC8nOAtmpwAi0wer2/++yQAELYf18O7Rd7z kZhYnng/zuc5nWqj/jNmt+jGrzu/Sbn/8Nezjw7CbyDTnmzB4bG/RuLKGtrBCaGopnkJ cQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2120.oracle.com with ESMTP id 36yeqn0jsg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 02 Mar 2021 18:02:59 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 122I0xbs172910 for ; Tue, 2 Mar 2021 18:02:58 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2104.outbound.protection.outlook.com [104.47.58.104]) by userp3030.oracle.com with ESMTP id 37000xbymv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 02 Mar 2021 18:02:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mWVWaPfQ2d7hHv/wJWSPrDbexAuZjNsUwIrZ8GoCquz4Htd/EC72AXgA1RVDiQPlUI4V+I305bumjIHmCNAn/T8TnCv8UYIa5alA5eaxKl9GFRM0ePyJiNlbsBygJ3hDvVkiWSwTKhDCEPg3TdfUXsnSWpYiNqgbIncWxtUw2hocz5luliXtnnItFwwpUNlEz7Jt/NosEU0wyYPqAeuxiVU44U2NVm9md8xZFzDOtHFeDbtQkynQHRbPjgwRfF0MQcEltXTDbqTZQb1sfe+BSyl6yJub+f00Cn+TK6TfcOSGfiDI0i44LYl885WJxsE8j+ZD19mnnpjIbCtuXN/1Bg== 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=skTeC2a341Sx8zXEwnG5YPi0yGiLZ7wTmMw4eYjURp8=; b=ll7st5qBJieMQMU494sDq3mojs9UFWzT4inAYgcAOKnSrmNWIZCwInUBsmklw50RPY1Kg20HaghCh7rxemnT4SBn5nrvo1ITQns026kViFgQjtDvtO38VslhLeAUa6XU62trYorExDHuSB/iJQHmdoPAcGQ47RTc1A1DUyApqrvSk9cOOTQVgfWK28PsvS6R/2Y9JhIy3IG5IjNRJ5dfv/ohmdl5gdopELwdk5Bq8ZQhK+yWaGyE1jUZ5DK2gm+J8R+ZLM0EZhYDpxeOi/O277RHtxNsh2ppS7RnuT8KZLcxcNFCWT7XTSFYpnrhKU/VqmHHsSbJQa6crRQjrbO8hA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=skTeC2a341Sx8zXEwnG5YPi0yGiLZ7wTmMw4eYjURp8=; b=B8UzVn6c/s9OAhI5jWJ6VaReguX6Osq8bLp5CEOmWmk18eNnTSWbmhP5Qr+IzCI9+j/04KMh77HfPUfS1r4uKx6TjHnTEMUa76yTjP2WhCYClK0S0v4S6TJpME5xnbagZUmbU8+FDW9Ne0hbX+3jEtXnzKxGuwGxwzjW3VfMP0s= Authentication-Results: gnu.org; dkim=none (message not signed) header.d=none;gnu.org; dmarc=none action=none header.from=oracle.com; Received: from BN6PR1001MB2228.namprd10.prod.outlook.com (2603:10b6:405:2e::38) by BN0PR10MB5192.namprd10.prod.outlook.com (2603:10b6:408:115::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Tue, 2 Mar 2021 18:02:56 +0000 Received: from BN6PR1001MB2228.namprd10.prod.outlook.com ([fe80::a06f:8b3f:14dc:8af5]) by BN6PR1001MB2228.namprd10.prod.outlook.com ([fe80::a06f:8b3f:14dc:8af5%3]) with mapi id 15.20.3890.028; Tue, 2 Mar 2021 18:02:56 +0000 From: Daniel Kiper To: grub-devel@gnu.org Subject: [SECURITY PATCH 023/117] gnulib/regexec: Resolve unused variable Date: Tue, 2 Mar 2021 19:00:30 +0100 Message-Id: <20210302180204.23887-23-daniel.kiper@oracle.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210302180056.zq4bk2w2cuqhbvx3@tomti.i.net-space.pl> References: <20210302180056.zq4bk2w2cuqhbvx3@tomti.i.net-space.pl> Content-Type: text/plain X-Originating-IP: [84.10.22.86] X-ClientProxiedBy: AM6PR0502CA0048.eurprd05.prod.outlook.com (2603:10a6:20b:56::25) To BN6PR1001MB2228.namprd10.prod.outlook.com (2603:10b6:405:2e::38) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from tomti.i.net-space.pl (84.10.22.86) by AM6PR0502CA0048.eurprd05.prod.outlook.com (2603:10a6:20b:56::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Tue, 2 Mar 2021 18:02:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0a2477b0-b743-4e20-9441-08d8dda56822 X-MS-TrafficTypeDiagnostic: BN0PR10MB5192: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4s8ecPC8aynVwpk2UcFeAN8vIedcPa05pJn5W1wwFJoKmoTr+IeuO2QB7UAOBjvE7KYBlEPRmTupYSxKB8DXjZFZAhbMqgYJ66UjNIJublFaib2b7fxea9IGH+jNEGdFW/LBRGIn4s6mj1gObCTDCKdxTJN6vrn5AOc63TaczcGzZh+nHSE4H3Sn3iF/GOKqHKmvLZvZJpKCpGKv6tGDAk5UjctOvfSs8/Er5VGi1X59A8DI6C0o9XEXHAvWoyPAizo+uL/xbd+uUzm4/u2otEbJY+oqI/+ma1PdmoZoLVBHGKAMr+iZKFMhddT9K02ynxg5sg9WValvirh2TFrMXLbBP7p+1TXlGmz0TgMS0GIukJDYaY6g/4eDXlqxr4qV6P+pEa3zwP63oSyiSzMXsajzsBYrwxMuPqRctSmopTFsLojxiBLpO6drniHfAybh85Bwdmm1cDwFTGnM2T5TVb4Zbo3ywvxSAhWKDcWlWjSRtjV132Bba4eri9XqhwnE/6pgy9w+kG/DtXrHDVDtBQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN6PR1001MB2228.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(376002)(136003)(346002)(396003)(39860400002)(6486002)(478600001)(2616005)(44832011)(956004)(186003)(1076003)(16526019)(5660300002)(4001150100001)(6666004)(26005)(36756003)(86362001)(8936002)(66556008)(2906002)(52116002)(6512007)(66946007)(83380400001)(6506007)(316002)(6916009)(8676002)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?UKQ6Lq3+a7XmEk/P3vAIOfz5DpUKS5LuT1NfPT6H9Qbj1QaNQkc8WxNhK9mO?= =?us-ascii?Q?tKHRiecxm/YTlOttxcVszyu0A8pflUKc8kKgGRKig1OGZswW1gZS8hNF+dqc?= =?us-ascii?Q?SK1eZSRA5FSVb5r4f10WTa1M46xFtKMNVpNrpn/GS0+gI+YEYKRffYlkVSAx?= =?us-ascii?Q?3GzpqVsqMfnmAFBGdlE5wkqGhT5+F5jI1zMc/YtBAsRNjJ+brBqHyZGIqjpt?= =?us-ascii?Q?ih+HWRUPHm6aVXR85W4xUckJ5/0YA0uFXib8Q+q4ly7le5j9gOYokv15ixst?= =?us-ascii?Q?RUhfB/xFKJ58qkqX4PocnhEZ/yulcYOyoIwZfRG75enhSRKp1EAxmsT4OyRl?= =?us-ascii?Q?6VS27TQLTej4eJcdYt3wetJXokuLoaVRDu96P7sSJt/KmMO79WEOsETmNwhL?= =?us-ascii?Q?mb8PXfpBKaKxXYOSu0TjsniBAcHQieWOI4pC1JvT5LYCIpTx+rsUVHwYxs43?= =?us-ascii?Q?if91163wgNF+swPsfG/4BeuepSLeEvQ3mW3C++C8wpbJASRpsK49+kvL6Mfl?= =?us-ascii?Q?FlzqxT6zi4iwRuXOugS0ygGSJgpj0H7yzZqz+ol9FiPxw7AsDUn1zI4O+HSe?= =?us-ascii?Q?TFiJw3wL12wA0B0VlgsE81DnFWYQu1CJpYNFBMULLF+jyxViE4LUTBBHO7nH?= =?us-ascii?Q?PbwXjyuNwjx/SE3NXkxFY13GhPzSjr2fSLHpePl2MV7K2aR3nnezL1+yKT6q?= =?us-ascii?Q?0tLrU1gimV+4EApssosOzfSqoRYtBGaPybgLTX9DC2M+hjDd7tL1p5EC4LX6?= =?us-ascii?Q?/LZgbt6W1Uy7EtkMi9WPwJPDnbNlTPj2y5xDn9lfk4AlDbekdo5B/1AWOMj6?= =?us-ascii?Q?/rmpHGYSoXLWbmv9LswrwAk6PsvdMNVcjPezhcjVBe5NpAMRanxM4BSwsS1K?= =?us-ascii?Q?QcfmJl4sJwKB/luFiZy//qDIEstUAl04f3S0Y9PONOdXezoqABVBb9HtE8CF?= =?us-ascii?Q?iyYTOsYXojpexLgRTGVuJ29lS+p/BjrFzj9dYNsZONWBVkTlXijGwFN/p462?= =?us-ascii?Q?sIPY/CyMimQi7rRsQG/2UkahTM/T7XnDms5dCM53TgQJ4s0kSJ0dqWhLOr8G?= =?us-ascii?Q?7/MV30ZvruGjqPuq90MOWAWTFbAmzgrLmfH/bN8Uwf//p8lh/x/QXjesOJW9?= =?us-ascii?Q?llxBv84RFjpIdb72aZ2Dpb3lilVSqofguNZqyuzkbp2d8VJ+8+Q8RL7Do7WM?= =?us-ascii?Q?yU+MCOqSSfCV6cuGVZH+5X5/TaQ12i872TdtHeaLZMDK+zoSoS3FwDB1+vxy?= =?us-ascii?Q?BmMSbuKZ9wUjhB+faZRb8HkaPeHzwOe8JqTb29qqLXVLpyohUxe6fBb17prk?= =?us-ascii?Q?bMrnIo1Xpl09hjaOfYORT+fc?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a2477b0-b743-4e20-9441-08d8dda56822 X-MS-Exchange-CrossTenant-AuthSource: BN6PR1001MB2228.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2021 18:02:56.0593 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3ADfJPEfaD6HLyzDjTmKMydX3E5wxBYC+dre/SvET3LHJeyASOWMH2QUNqB2yP8OJm42Y8d+L7+5dki6DAec9Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5192 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9911 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103020140 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9911 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 mlxlogscore=999 suspectscore=0 malwarescore=0 impostorscore=0 bulkscore=0 adultscore=0 mlxscore=0 phishscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103020140 Received-SPF: pass client-ip=156.151.31.85; envelope-from=daniel.kiper@oracle.com; helo=userp2120.oracle.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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, 02 Mar 2021 18:03:11 -0000 From: Darren Kenny This is a really minor issue where a variable is being assigned to but not checked before it is overwritten again. The reason for this issue is that we are not building with DEBUG set and this in turn means that the assert() that reads the value of the variable match_last is being processed out. The solution, move the assignment to match_last in to an ifdef DEBUG too. Fixes: CID 292459 Signed-off-by: Darren Kenny Reviewed-by: Daniel Kiper --- bootstrap.conf | 2 +- conf/Makefile.extra-dist | 1 + grub-core/lib/gnulib-patches/fix-unused-value.patch | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 grub-core/lib/gnulib-patches/fix-unused-value.patch diff --git a/bootstrap.conf b/bootstrap.conf index 6d383240e..4c8c37c16 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -79,7 +79,7 @@ cp -a INSTALL INSTALL.grub bootstrap_post_import_hook () { set -e - for patchname in fix-base64 fix-null-deref fix-width no-abort; do + for patchname in fix-base64 fix-null-deref fix-unused-value fix-width no-abort; do patch -d grub-core/lib/gnulib -p2 \ < "grub-core/lib/gnulib-patches/$patchname.patch" done diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist index 37dc3aa10..0d3b74e8e 100644 --- a/conf/Makefile.extra-dist +++ b/conf/Makefile.extra-dist @@ -30,6 +30,7 @@ EXTRA_DIST += grub-core/genemuinitheader.sh EXTRA_DIST += grub-core/lib/gnulib-patches/fix-base64.patch EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch +EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch EXTRA_DIST += grub-core/lib/gnulib-patches/no-abort.patch diff --git a/grub-core/lib/gnulib-patches/fix-unused-value.patch b/grub-core/lib/gnulib-patches/fix-unused-value.patch new file mode 100644 index 000000000..ba51f1bf2 --- /dev/null +++ b/grub-core/lib/gnulib-patches/fix-unused-value.patch @@ -0,0 +1,14 @@ +--- a/lib/regexec.c 2020-10-21 14:25:35.310195912 +0000 ++++ b/lib/regexec.c 2020-10-21 14:32:07.961765604 +0000 +@@ -828,7 +828,11 @@ + break; + if (__glibc_unlikely (err != REG_NOMATCH)) + goto free_return; ++#ifdef DEBUG ++ /* Only used for assertion below when DEBUG is set, otherwise ++ it will be over-written when we loop around. */ + match_last = -1; ++#endif + } + else + break; /* We found a match. */ -- 2.11.0