From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-4.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id CA58B1F5AE for ; Fri, 18 Jun 2021 16:02:41 +0000 (UTC) Received: from localhost ([::1]:46558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luGx6-0003ta-Bz for normalperson@yhbt.net; Fri, 18 Jun 2021 12:02:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luGfh-0005rb-TY for bug-gnulib@gnu.org; Fri, 18 Jun 2021 11:44:41 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:14332) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luGff-0001yi-MS for bug-gnulib@gnu.org; Fri, 18 Jun 2021 11:44:41 -0400 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15IFatE8030689 for ; Fri, 18 Jun 2021 15:44:35 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-type : mime-version; s=corp-2020-01-29; bh=gAS+UTsOo/1OtdwranCYQIYK9PQ32xHrd1whdOXLDNA=; b=V3w3MLFdhQ8d/s5VwJ+U4YEIZpVMuSN4QJ7nZOIM5ge1WgFHNbWsnu6Fm1D459RxtZke Vrz+PF21fBA4gaBO2H30SEXhlgm/P2kQ9N2CRxJBTxhQ0XqcJKBvfPI+lnaBTYovNL+C A/nm3yQTbpt+xxZ9U2ZnAoS6NebA9cpdO3z9AsQ7Qn8QL7YJTsr40BH0gR/MBOeip0mH noOZN+ojBzW2wYPPNCRTzB9NlLMTkfeL9Am5G5Bo/gyTMgBJNpuqg0LQbjPGaybTVXw2 dGOeybuvGIUrFNAUFtIIDZi8vL08nDXmNCB4Dm4gjWCsRMO/ZjfPwWr13sl7oW4vYw/X hQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by mx0b-00069f02.pphosted.com with ESMTP id 398s5p8kh8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 18 Jun 2021 15:44:35 +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 15IFYxsg048789 for ; Fri, 18 Jun 2021 15:44:34 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2102.outbound.protection.outlook.com [104.47.58.102]) by userp3030.oracle.com with ESMTP id 396warhrka-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 18 Jun 2021 15:44:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lc+8B2KLgbQZlnm9iFxoAG7atApjqs1CGyad14G29ZvXu22umgXWmKlm9LMvlRPyo3FwIdqXM1nUiNaAhJX8DArg5HniUfJ59HUSXGY0ifZoY1GRUpGQAs8Gez9nh3gcMtIo70OHYKWB/9wEAu4M/hdKVVaBa9cljWugBvmEeOoTfuF7Sgk/Fz9qzbS+0XDOHKtRwFFgerrAkpu83w2NOf0jlM6yW8LJu2YW1BNWSrw0VFRQrqrSMmAu+XKertOHXTPAGnSSdQg+hN26W48h3sysP+JyxcT6eeRc25piCNN9EtZQRVb8GeLoRtv9VOAVJJ4p/Yp8qsPDQDd/HmNVsg== 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=gAS+UTsOo/1OtdwranCYQIYK9PQ32xHrd1whdOXLDNA=; b=aWo4mSyYG2cHLx88hs5RZFD/+EBarPcI7316afRP84Z1asF4qZM6z05E8p7/JtcfLNBwHghCspGKMSqfstYS0bYxB6k6gEYG+ZkLNrBHxQ3y5dbtUKy1MNomvRfDdux7oKw3xo+euZveItHtjmGkgiK1Vqa4XJLIitrg9K/kjgz7mC7ldCbXNQrChN4iDMzkEV79TZ4dD/MPeJNFt8A+29bKZ4yDa026thqJ7s53cOh5uhQlcK90KLtRCBW8b9eCXa7gmoUQ6N6cDN8DzdSh7++jQPyBMQiBEyxsFZDiNR+zmIFO1wyIBT72H8hYJHXdYHjJpWnUSVmKKgys6uNI7g== 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=gAS+UTsOo/1OtdwranCYQIYK9PQ32xHrd1whdOXLDNA=; b=R91ktPTKLIv5IeVhErxaIQ1L9foOUGNGi2hU3hLw0Vh9hKvYlJ/L2v75zo+cx2AMV3lTDRu6MG7G/0eG9iK6UG1agvswekHih1ha1fJowKS7j1gW79nL5wMNX0MdqJ/PNVEG8PU+JgUt9VgOAdL9tnkZmfUBlluRJoxjIV4lfBI= Authentication-Results: gnu.org; dkim=none (message not signed) header.d=none;gnu.org; dmarc=none action=none header.from=oracle.com; Received: from PH0PR10MB4583.namprd10.prod.outlook.com (2603:10b6:510:43::6) by PH0PR10MB4536.namprd10.prod.outlook.com (2603:10b6:510:40::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19; Fri, 18 Jun 2021 15:44:32 +0000 Received: from PH0PR10MB4583.namprd10.prod.outlook.com ([fe80::587:a73:b6cf:3f50]) by PH0PR10MB4583.namprd10.prod.outlook.com ([fe80::587:a73:b6cf:3f50%5]) with mapi id 15.20.4242.021; Fri, 18 Jun 2021 15:44:32 +0000 From: Darren Kenny To: bug-gnulib@gnu.org Subject: [PATCH 2/3] lib/argp-help: Fix possible dereference of a NULL state Date: Fri, 18 Jun 2021 15:44:22 +0000 Message-Id: <85c9172a3ccf9909f244993b3b02416783880da8.1624030621.git.darren.kenny@oracle.com> X-Mailer: git-send-email 2.18.4 In-Reply-To: References: Content-Type: text/plain X-Originating-IP: [141.143.213.44] X-ClientProxiedBy: BYAPR11CA0058.namprd11.prod.outlook.com (2603:10b6:a03:80::35) To PH0PR10MB4583.namprd10.prod.outlook.com (2603:10b6:510:43::6) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from darrenk-20201221-1634.osdevelopm1lhr.oraclevcn.com (141.143.213.44) by BYAPR11CA0058.namprd11.prod.outlook.com (2603:10b6:a03:80::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.21 via Frontend Transport; Fri, 18 Jun 2021 15:44:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: efbe88c9-18b8-4be2-b7a8-08d9326ff769 X-MS-TrafficTypeDiagnostic: PH0PR10MB4536: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:215; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vJRQuirciDX75GC+cHHlWQDCqBV8JC3CFr7yik04Aau0EOq0652EGlYXIpOUNzNx/Umiq6wE5RkS79XCFkT5KnxgsPE+38Eb1c7Pwtm6O4YyLGtd49BLHGNwxu5L8TfVE3Z+U2UDfrOAx2Umk6pheX2Yyqqc7qpepmhO+OiOXoRl0JhUmDOiNpQa0Efj96SS4vfGnx/HfO5+ypXNEPfWYtptqK8xh5HzUZMVWP+nJnWiZo7zKzLKsEFW48YhjCJBN1k3C8JWqzafGMMZjdC3zrEG5QZTLh5NK5iJaR0ZjDaR3AFxe8y3zq4UpzBxwEmFgjBUEHLspSqPTHuM+xwCnRzdBWzIaMo08fOaqFWD8xxxv9DkqyWV3CaZeOLSVz+LT5WZvtkIHUWcuj4G9JyW0/rVo1OTi0qda6QQP88LejRx1pxboJLTYye/ztMuy/HEhNvFJy0mGEF7LMPciEgtFxlrXCjoNVTfq59igLzKmrFoQBN1PezkrS+sTls25qNX+95u4Y9nfcW0flK7z7Of6n+fzH9ZWN1VqDyjhZ2MNjUcH7p448Kbsh56INPKZBa22hc/gUJOF6EO4W7DPZOrqmceZPqau43nLrmwrCeBZGdr93ojEhA581V7FP0CBZnenMvCT4QjTDD+40q9t/fkotROD2iM2Xgr6rGnniwfiik= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR10MB4583.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(136003)(396003)(39860400002)(346002)(366004)(376002)(26005)(38350700002)(478600001)(8676002)(956004)(83380400001)(6506007)(6486002)(36756003)(4326008)(38100700002)(44832011)(107886003)(4744005)(316002)(16526019)(52116002)(2616005)(5660300002)(6512007)(8936002)(86362001)(2906002)(186003)(66476007)(66946007)(6916009)(66556008)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zc4j0QVwciFeWpOxjZHzDBaagWsc/kE2FW+TIIqZ6OPnmaz94H+QWaeDwWb0?= =?us-ascii?Q?vXC5j9NTk6fjDV0cYpTwXvXkQts0JQyZS3Rd3qqjJ8Gid2GXY2TqtCaPbM2h?= =?us-ascii?Q?G83gjpZMArAI8B8PC72PWId0aA8R/QV3zsPxibnhcUhLOLMZb2n+nCeuCR0Q?= =?us-ascii?Q?rbM7TsPHYJWXb59HD8kjhNrUIYj9+XQj6ueGe9zd3j3UhDz4ssR2+FbiZSk6?= =?us-ascii?Q?SukRSpEy7rDeZl+sORWQvNeJwps7rTfo9exL35vY+BXdfMNsWQDGgAeG0/3u?= =?us-ascii?Q?5unckbgqLaubA+d2Q1cK5huB66fbA0KsNKT3B0pdtCqSRzNKkeWiAYHn2ptP?= =?us-ascii?Q?9wDck0QDm73TrQUV7NerLID2Ut/ClmdvfhYqCP4YOBslZUnlygYkZSp/Bynz?= =?us-ascii?Q?0YmIueUTA7IbGbmyxaeMmrNorpOJ1PWWDpiWAPL/YSGcZCL+wV8nquhDWO4U?= =?us-ascii?Q?/xFegAT/DNWiXQrN0O8ab3r4u+k7JBpOKdYg/TGSi7WpL+D2jsAWpt8DdCgm?= =?us-ascii?Q?8BXj9bFeSBQhHv37qc8nxYY5rBcuwC3g2VNwxoeLEvsustWJXGcuCCeGuzbK?= =?us-ascii?Q?ZEy52aL6MEeUdMG9L4+nw4gSnenv+jGPLiOZixzkoZluXCn7BKS+O/voptAa?= =?us-ascii?Q?4m7vqK2n2dRGt2i/ab3KycEmeYOtIxCkPCpjPI2v7t1hkq9hKMyTNillcqKA?= =?us-ascii?Q?+oWP6TL+pGkDluU377v6A2E49tMI3r8lqNocc0gZN63yjsa/yOa/gEMekh8O?= =?us-ascii?Q?/DbEL5gweCDceGvopBbTv26j+pABHwX7MJeAGHZopbBfyRCzRmq8t0V8cXFf?= =?us-ascii?Q?/x7+ByYvMt/URcdfrmL37dpEx9+yBDPY5hUjSpsQr10kMEK16k95DkQvL+dK?= =?us-ascii?Q?NGW0th2N3+XzCFVUjCVLTTMCXtSVPP/EvaJHNdMkvFcdUwPE9ahaOk03dlAe?= =?us-ascii?Q?AiS1iZEFVN0uSg1AnRgtVHQ6SDUwFP+93KmuB9gLLHrnB1R8m2x3GS2FLey9?= =?us-ascii?Q?wxvlbylFOV3+QlFI864NQ1tOmLfgpm8ZbIh5GqeEgYriVOzW4QIsNoS7sDsy?= =?us-ascii?Q?PaLC9xQP3VMf/xS5WKVEa3gYDZKnNkmk4Gh18lAWjA8HjklXQer/2WFS94O0?= =?us-ascii?Q?G6pvPLrBlVqIpE/a+cosjyh5qi5rISECl2MZnXQ5/E6J753NaauAndUJ6UkN?= =?us-ascii?Q?2hGruRSX1UrVrRWyV8ineOfxLKxtREWVXs9CILrB/dl7jMxBltRFsZEKiRsV?= =?us-ascii?Q?avwHffZQ3HSAM1baNtmB+WlypF13bu0u22AOhic4F6r0Sjuuu7g62xqSbFie?= =?us-ascii?Q?xxSuwhybx22np/msE0uaT7jd?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: efbe88c9-18b8-4be2-b7a8-08d9326ff769 X-MS-Exchange-CrossTenant-AuthSource: PH0PR10MB4583.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2021 15:44:32.4539 (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: 9Aj5+L5bPL4j+pU5+eoRN2EjqC6QJxMlb18vZlWq7/Ko9evckhhu6LoQ2LTXAwoNR1p19M3qkpvm572rLeha1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4536 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10019 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 mlxlogscore=999 spamscore=0 adultscore=0 bulkscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106180091 X-Proofpoint-GUID: Tb3V2andsLz_QWDkPVionwyaCtjMa2an X-Proofpoint-ORIG-GUID: Tb3V2andsLz_QWDkPVionwyaCtjMa2an Received-SPF: pass client-ip=205.220.177.32; envelope-from=darren.kenny@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 18 Jun 2021 12:01:41 -0400 X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: darren.kenny@oracle.com Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" All other instances of call to __argp_failure() where there is a dgettext() call first check whether the valie of state is NULL before attempting to dereference it to get the root_argp->argp_domain. This was originally found during a Coverity scan of GRUB2. Signed-off-by: Darren Kenny --- lib/argp-help.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/argp-help.c b/lib/argp-help.c index 4c89697bdd05..80cdb44937d3 100644 --- a/lib/argp-help.c +++ b/lib/argp-help.c @@ -147,7 +147,8 @@ validate_uparams (const struct argp_state *state, struct uparams *upptr) if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin) { __argp_failure (state, 0, 0, - dgettext (state->root_argp->argp_domain, + dgettext (state == NULL ? NULL + : state->root_argp->argp_domain, "\ ARGP_HELP_FMT: %s value is less than or equal to %s"), "rmargin", up->name); -- 2.18.4