From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1175177-1517178469-2-15261295948406673843 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517178468; b=HKuoUvu+IXWCHUqs9wcpeqw92307qMFeyjMnmO2MuoginJz M5fOjq8L1S4h/GcVfSSotqnuGkCd2b9GJa4bG2Qb6Unsr7TDSSZiABrgSTwE4uJq wHeduQy0/ln8mRl49BMt8GX1TYWvs1ZDk16HAh/DqTSBqrXunAXWu3066MWX7YvV eEaToRFU21RF4uyFSsuKzhhvKqMT4Jf5uYd/SVwlj+JMskNQr+Lm71xqMdKEbVph Pc25wbsocxoMU9NkyZW1ZWNbTl5RFw3ahCp9tL7y4U9WoO1fUoGr2EuWflnWMfR3 twAKoHOjUxEJXx+OccEF7aBu8LGlwkRCaqhWvqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517178468; bh=HvysMO csBuCx+Y+xtoG5aJen6cWTQ4RAgz34FOWyBZg=; b=p4It9IwMkjxwXdr+G0nc1q h7on7fFE4QPNDp3TNSqD4b4xwntpo4nx5sUWgzMTvHHUy5AgXsYcVCUOwvXJtYwW pA/lwHi7tbUY7IE5i6mC49KpSbPJD44JDNtS3962bgS3G3pcb3r9/pWmfMNV0Ign a1piqeZKAIweR6Klwm5RXf0G8UB43a5CM3CBHhmIpHoqq/qwWQJwIZzYLE4M3aKL OolquMwr2j9fwQ8z6RbASgWuYmVZw4iStpPUejpmWhl0LyuBh7FTQftkEomvsdTL N62sPeihvS/CfBDS3vpHM8juSzTBNl/SmcIF3w7S9JsOen4Nam5PtSr8OaDpwd9g == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=V/4XHqNA x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=V/4XHqNA x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753490AbeA1W1o (ORCPT ); Sun, 28 Jan 2018 17:27:44 -0500 Received: from mail-by2nam03on0134.outbound.protection.outlook.com ([104.47.42.134]:46538 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753479AbeA1W1l (ORCPT ); Sun, 28 Jan 2018 17:27:41 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Eric Biggers , Eric Biggers , David Howells , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 070/100] 509: fix printing uninitialized stack memory when OID is empty Thread-Topic: [PATCH AUTOSEL for 4.14 070/100] 509: fix printing uninitialized stack memory when OID is empty Thread-Index: AQHTmIcTnKB9DQFJH02ZUNCqJgY8PA== Date: Sun, 28 Jan 2018 22:26:44 +0000 Message-ID: <20180128222547.7398-70-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1034;6:0aBeX7RAJzzK67wq+T/RZKHmSJFc2B2i+MBFgf1IUQ7dngc9+r8ildpwlYkdlSY4KsFZWW1BB3ByyzmY1hCSCSn0S52lwoy4ngj/KT3/kjTRDBoBnvXe4Z9YjjwLBJxDwhvFhv/29Xc2msyUbFCcC0IDyVaJUvkXyLc9aatZ2/t1HMXy5TxoVC+pzaRnxG+AvgAiIojKt2UOpsdC/VDMovjgmHlReqUN+XPsbZ6CQOp8ofqF3Z0t8kEQgSXxpwQw7Qy9dPe/wTtVsohsc7W0VlPYPLNpXQs5hoiWNuYUNZb9rk7c4ZTWYPEM8dFy36eXYnPYBUZ7xnoWeDLdA4yjp0kMVY7mOg1SiMAAS4KcDtcLu/7edJrGw/pPyngp60Br;5:+eWH7i7/LkNz2tnN+1DF5eeZ1xACQA3/vCd0eT2hZLTo+EY2VeQTIyKwCWHUFT/nVXTWZ9QgZGnx2k+AQ4JB+or5/juVXH7lsIu/ub6HTdZt/qqr+kUWPPMNwylbakKfLVbqafp2GEhGcJAVUWfyBCFpJT6BvLuq2GxEtIS25o8=;24:PTQAJCBnq4bLUU0X9fWKCRa2vig6CZLUS64NeeomdeCtkgOlwTIcnhNMXusWTqTJOjjtf7EIy5gcy1QKqYf76LH6tPLKEOArEM9M0dagVMc=;7:LFOBiysrYkHzC/xKwBbVybnGoi2FaBzNm358G1NuFfQLorFfRcis527TajuqdPNH/2VNg9JkD8sVeTEFNMjE1LkoTVYgU942Cx1Da6uoA28kQmclDBAWYtr5mJi7IPH2WzVQUjCQmIl+dQGw+0WN4ArG0JWSty0UOVCETsmdTNeOAIsZVSiotT/indCYbzp6+9KY6ukwSlxmuQC/ER5RnU9PlQBW2WzkcoNNdpamgdddaJtvM7h6KG/xCEmqmXzJ x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: a3e1bd7b-b8a9-4d02-b9e0-08d5669e557e x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1034; x-ms-traffictypediagnostic: MW2PR2101MB1034: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(211936372134217)(153496737603132); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1034;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1034; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(346002)(376002)(396003)(366004)(39380400002)(199004)(189003)(2906002)(2950100002)(26005)(1076002)(66066001)(6116002)(5660300001)(3846002)(186003)(316002)(22452003)(54906003)(110136005)(6666003)(86612001)(36756003)(6486002)(86362001)(53936002)(6436002)(6512007)(106356001)(8676002)(105586002)(305945005)(7736002)(39060400002)(68736007)(478600001)(81166006)(102836004)(76176011)(6506007)(72206003)(10290500003)(14454004)(2900100001)(3660700001)(99286004)(97736004)(81156014)(25786009)(8936002)(4326008)(5250100002)(3280700002)(2501003)(10090500001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1034;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: agDT/Ju15Z84Yhiwpa9HrSY/SMws1mQ8qq09LSu9gnP34uVp109zZ1uzhEqBEAWlkndtQyJ23Ol51HnQ7XoVTw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3e1bd7b-b8a9-4d02-b9e0-08d5669e557e X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:44.6135 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1034 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Eric Biggers [ Upstream commit 8dfd2f22d3bf3ab7714f7495ad5d897b8845e8c1 ] Callers of sprint_oid() do not check its return value before printing the result. In the case where the OID is zero-length, -EBADMSG was being returned without anything being written to the buffer, resulting in uninitialized stack memory being printed. Fix this by writing "(bad)" to the buffer in the cases where -EBADMSG is returned. Fixes: 4f73175d0375 ("X.509: Add utility functions to render OIDs as string= s") Signed-off-by: Eric Biggers Signed-off-by: David Howells Signed-off-by: Sasha Levin --- lib/oid_registry.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/oid_registry.c b/lib/oid_registry.c index 41b9e50711a7..b5f7d9986be1 100644 --- a/lib/oid_registry.c +++ b/lib/oid_registry.c @@ -116,7 +116,7 @@ int sprint_oid(const void *data, size_t datasize, char = *buffer, size_t bufsize) int count; =20 if (v >=3D end) - return -EBADMSG; + goto bad; =20 n =3D *v++; ret =3D count =3D snprintf(buffer, bufsize, "%u.%u", n / 40, n % 40); @@ -134,7 +134,7 @@ int sprint_oid(const void *data, size_t datasize, char = *buffer, size_t bufsize) num =3D n & 0x7f; do { if (v >=3D end) - return -EBADMSG; + goto bad; n =3D *v++; num <<=3D 7; num |=3D n & 0x7f; @@ -148,6 +148,10 @@ int sprint_oid(const void *data, size_t datasize, char= *buffer, size_t bufsize) } =20 return ret; + +bad: + snprintf(buffer, bufsize, "(bad)"); + return -EBADMSG; } EXPORT_SYMBOL_GPL(sprint_oid); =20 --=20 2.11.0