From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517178704-2-10485688675563667249 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=1517178703; b=t+KMzVrQBca7QNoQjAAh6PRJWGr5QP8K437JPwNzoehigFZ nnxxB1MX8Woy82msvri0sJtU8Ij2DKiM5/CFuMPWkM+a/MKYzEvFNZYk4N4dT87l 6TdmA0RFOyJloPpt47eeeyrZ//KGKBxeP4CCuXTQDS2C7AjNr+QnOtxCyg3bXR03 LJI7zKHBS0r76e+8EQbQibqPo1qeukw8bCU3qhhce0zVau01NOLD5Xv50LPiMzCx nm7PLAqPRxEv+c3B+jlkGmh3/+4xvxOA5Y7b6o4qW9FmVFRVA9zxlysmuWNUYI0u 4Y3f6SJ9IH/UwGLm7XqdoO2BGo8OGrTV7745HUA== 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=1517178703; bh=FqxbD2 3Ji4KHvHp0P8BWgXs6TzPjPTMvI9uhtio3E74=; b=QnTuoEnvq2/5y1OPhwRKIg AmVFqKdgpmgeKaLWzj4881Rt773Ug2shCDzOsLygPuuYm/4TCRBkQkqM8CEpZeW1 cwi9S6SjsW9k/AGRd7LUJMP/E/V4AmZ6dF1BlEOmcsa35d/onOwiJ5wY+XVj+ghC PNTtSbTAki7kRpm4mLUvhY8TQWv46kvWJhG5OKXn592qNp7EpiS+TFkvA3F0qyyi l0P+iy7hg6+kKdwBM93wx7X70N8hbQ5oK+bK12AoQArYnwRf2FHkR4IRy7uralPo k5p1Fb/IwpFY7/wj++jYGLL8YHpeC7dc60e6HnpI+7eXraOFmCRpU2tD2CN65VfA == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=O1o8kyqj 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: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=O1o8kyqj 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 S932675AbeA1Wao (ORCPT ); Sun, 28 Jan 2018 17:30:44 -0500 Received: from mail-cys01nam02on0129.outbound.protection.outlook.com ([104.47.37.129]:29515 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932638AbeA1Waj (ORCPT ); Sun, 28 Jan 2018 17:30:39 -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 3.18 16/25] 509: fix printing uninitialized stack memory when OID is empty Thread-Topic: [PATCH AUTOSEL for 3.18 16/25] 509: fix printing uninitialized stack memory when OID is empty Thread-Index: AQHTmIeFmEEjtvP49EeNjEhnX1urzw== Date: Sun, 28 Jan 2018 22:29:54 +0000 Message-ID: <20180128222931.7781-16-alexander.levin@microsoft.com> References: <20180128222931.7781-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222931.7781-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;MW2PR2101MB1098;6:4Akd2XxubHnUtV5A9UY8aXOFVvZFa4wpWXmeIIDXJb2a1/YcKR/nG5l9V95rZD9Xo2mddOaYwSCS3yjJW3PGvUlQv/aZW/TdtKHp5QizcnZFDYbUOoB/xnLz3UGmSSMaL4Vnmb5NSAW311XZfS/ghfwCw4PFUCsIs6xyUIogElYYcpIcJ7ZY8xEc0NwqdyUswBNASMg3P2kum1A2QUAUFIFO04P/ZBJuyj+RrI7P4idL+qsUVfTlyjgkFOXVCnTUSBWMJlYP7EQ5TexvCk9/izIzH9n65f+AQTH2f0YZnHLS6lFOa9JgVv+EqKC3tcUhu9+QadaOU0BGZ0l1g3OiFtFGc9cCA+nggrTyuMfbwtUg/1kxuMot5DFsUkyUZvcz;5:/jP1uehfjjVSBIlhRo99h/UkDctxbLccB2U5d89eXd+7Eov5MjOavJ+01exD2AE2zGv2qsotMqpI/yy43R0nFvnaSz2Fyttsy/lSUC57O1P6EwO4qfaSO8YYfId8UsDhFhgcYJTon0epxpqHIKRH/Zs+uFejBOsmxm8VXGH5g7A=;24:SjkNZq+EIRXweiXTtHCmbyVnECFrVCVqD9T0pmHYdYJ9z1YYTd1KqSsE/jmRzLyNdB1x1J61vIZOMRT8hn5VIH2y/tp7iJkRoMRXbup9/l8=;7:p0+LFB1HdgesvwzR7dGgYqB3GMAaBE3KL8tju+bfwT2y2UNdZ0B8y7KZtOAr+LyRS0gYYtDS/ZIaSS8I0z/i4ochm8K2ZDYu0PW2hfvIL/m5JBHXOj4J++s95ZMpc47B6k8xnhl+6KjfpzmAOgYh/7bD0IxoQdmRlZG4Uike/og5XsN4vql2Yck97eLHyqlhjP1T1KhJCDY2fqGym1kF0KYBjRAs+c3FuIorId7VccMsjhYrhId4Vwo3RBBNq/VN x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b4951ccb-18af-4ce2-9e28-08d5669ebf86 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1098; x-ms-traffictypediagnostic: MW2PR2101MB1098: 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)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1098;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1098; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(346002)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(54906003)(7736002)(66066001)(305945005)(316002)(72206003)(106356001)(2950100002)(6666003)(478600001)(10290500003)(6506007)(97736004)(2906002)(105586002)(25786009)(107886003)(5250100002)(8676002)(110136005)(14454004)(5660300001)(2501003)(22452003)(2900100001)(81156014)(68736007)(6436002)(8936002)(53936002)(10090500001)(81166006)(99286004)(102836004)(3660700001)(36756003)(3280700002)(86612001)(3846002)(6116002)(86362001)(1076002)(4326008)(26005)(39060400002)(76176011)(6512007)(6486002)(186003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1098;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: 4r2H9pXbGhQ0a23bFZci12uqjs3JuipaKZ9Kw6xZSoVaT/mtWRiqT/neW3hzy1UmxM0v07Wdfby7QtxJgDBDKA== 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: b4951ccb-18af-4ce2-9e28-08d5669ebf86 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:29:54.6385 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1098 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