From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517179884-2-12523984517309017950 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=1517179884; b=ToKl2ts1P6UnP/IKOEPCV3Pc+tvm7TrWFMW6PNo1AZjdMKK jjFBVzYYyouGNEyv3/bNgaXM05Lk9vtIOI8PIYUvXY3qEQFgtZ7gBMarGexgvOjU BGxi3hehsOc7sOlq41JntWy0PSuRjoUUYuLXh0Vm7KTNgi6m5eNckEXbyFm/dO+6 P/EoplA103/ZFHOjuldX0dVpnRmTSoVmLKj3fMXLyMxyeQ9t2ZyeZNsxoAZfX3Tt 8SmJA0CSc9akG4mjxMZQEoKaYxXIzija65r/CVoqlK4v/SxJC4a0qsSeYEi6LqjE eK83PRDU9bgJXCUwAXegVFGdWvx2MAdBEZHJi8w== 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=1517179884; bh=FqxbD2 3Ji4KHvHp0P8BWgXs6TzPjPTMvI9uhtio3E74=; b=Ek24ynlfc1qTeADgx4/Eql Kjl4skB61Wom7O1sLFHEZsyL+c6zqrZY6nnarjmM5rfdMu82Yi0ohSSfVrgmoCNG bMMyq2P2aQgCMelNVrOo5CDN0l464egeELOkf05yPEyv0wOyiYqOZyy/ektfq7DE KwfpdV1wGUOZmf6Ut3WycarhemAiUmgKh3I7wTpI3J4HjJpeQFNfingAE1uBCHs7 OD8+RWWlMbDAZQ4oG0pUApEP5yZjvt/cV4Sv6MI5RSzuYMxSe80D8CGsZJIwRrgl ZmleCA72WUSbUUZneuL+Y+gZ1T4sIWqfhwCSQHcq75HFMGirpWDGkH2pUtAZyuBA == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=fEeI1wkR 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: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=fEeI1wkR 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 S933099AbeA1WvK (ORCPT ); Sun, 28 Jan 2018 17:51:10 -0500 Received: from mail-by2nam03on0118.outbound.protection.outlook.com ([104.47.42.118]:52393 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753716AbeA1W3E (ORCPT ); Sun, 28 Jan 2018 17:29:04 -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.9 30/49] 509: fix printing uninitialized stack memory when OID is empty Thread-Topic: [PATCH AUTOSEL for 4.9 30/49] 509: fix printing uninitialized stack memory when OID is empty Thread-Index: AQHTmIc+oNdWZQfUO0aTbiOHUrQYVA== Date: Sun, 28 Jan 2018 22:27:55 +0000 Message-ID: <20180128222727.22404-30-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-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;MW2PR2101MB0924;6:bpje7w4ML85XnWEqK6Ll+OhTu9INkQTqPGGK75MGvomdRIuED/eJ26+QByf/Vd80L1+/4ToLXE54GHO24sTRdGHKbp3ImM8znmQcYGXRsXjN4k02Yx/n31NAtqDyekbm+gnAhzY0xtKK9glm4Uy2lB1pMPmPRdKx2H8sfjkr4KD7OK/oWQUdDcKQAWVvkFVrzmqoxbK/ms2BXi6E2EuMjzcu9K5MWsH7aX72EAUp5vF8dNzCnZRPJDSEt7cdfw0CUOneXFu/Zxn2e/h1rech8VFhOqaz4J1dw8JrDTFIBarRQyhtaDHQfGPbs9RVRdyaK4+WeKg23H7KG5k5J+8RNSjgmTlu+IKv6U35whKDj1yf3UOy/csN07ePBmIdUWjv;5:OSS+EXEWtiYcA9dQrGKy9zCgPp0EMKlGDuBqZGfBfLJmrAJpwE+FxxRmfFl2wskkZEU6j/ISPgxH0DUbMsKCj9dULNPLmhsSsmMHGbK6FSU2X2UpVae4Wg1fKkrxyCs4w0LagfRCZe1E4FFBoGvztlfcGSPGmdh7+S+P/91AJg4=;24:RBZHRDVg9NCwVcZSLRacq6IDokPIvLsJa7T78MPzAlDfQyyGYQ0gVE0sbpMFMxtZ6sR98yEIVuDGlJDFEDZA8eqlKDu8thWDct2ShaKKeA8=;7:MXbtmo+jen2GKXAETFVt84TBAd9BppGSd8nS2oULwIL1RvCpHQxE6Dq8mWpTt+ma/ldQESGjMxkNICG8xr7X4R40uMxBDCy2pE8kDYRHBJeeJcxH0dqtsbqsoSAIyAuEb62qGJdsD49CPGM+1eYKSbnTdbtXupXdjeKKOHHyAdbXGgnEflES+fKDVxpnV0p/OPhzTaijOeLpRTWcUpYPK31gj6MIeg0VnVhzJUyt2DHXhqe+vdIrZsyyESmiVDPj x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: a8de23c6-4afb-4af7-98ff-08d5669e8883 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB0924; x-ms-traffictypediagnostic: MW2PR2101MB0924: 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)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:MW2PR2101MB0924;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB0924; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(346002)(39860400002)(366004)(39380400002)(376002)(189003)(199004)(2906002)(26005)(10090500001)(6116002)(3846002)(8936002)(6666003)(86362001)(36756003)(186003)(66066001)(99286004)(1076002)(107886003)(86612001)(39060400002)(4326008)(25786009)(5250100002)(68736007)(2900100001)(2501003)(72206003)(6512007)(3280700002)(22452003)(53936002)(478600001)(10290500003)(106356001)(3660700001)(110136005)(54906003)(97736004)(6436002)(316002)(2950100002)(8676002)(81156014)(76176011)(81166006)(6506007)(105586002)(305945005)(14454004)(6486002)(102836004)(5660300001)(7736002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB0924;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: WZNJidBjOnXG3b3rzV22M9aSQWzZIPR6cCGGTBTUTDzrd/0jotfjoZJFwFQDwHXGW2qnet5XaSdZsfGTKUWfNQ== 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: a8de23c6-4afb-4af7-98ff-08d5669e8883 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:55.4189 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB0924 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 318f382a010d..150e04d70303 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