From patchwork Thu Jan 18 21:00:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125043 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp296064lja; Thu, 18 Jan 2018 13:03:48 -0800 (PST) X-Google-Smtp-Source: ACJfBot1x3MApnztS1zKBskQZli4kqtaVbAIffrsbkVa1ZFIUAaPB9fqMFrF7mXlwr/VCqEfYZiJ X-Received: by 10.98.58.5 with SMTP id h5mr39368680pfa.169.1516309428077; Thu, 18 Jan 2018 13:03:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309428; cv=none; d=google.com; s=arc-20160816; b=D2CvYEWdXaPQ3d01gdPAiJGVWdmQlplZIHiHk0qV6L4sn0kG+B9f5DXGv9HsNpIGZ8 ZGj/IqsM4kN5QDfwTZ8mzjehzls30chi3lHSWU+IPQQ/IS414nTAGlIqv4iuDbTmXtqE VK7qIk4BTBWDRAbT8r7FpzUTDVdWufaetTBKz6/2dKojmRGMgNDFhJ+b4SdiYET9ogL5 XZtEfjY0IzPx7D2hLXt4yuEjN8RtT+sGJhtJTnwPmqKg/tOwNS34OMaEgDql4MDMCLM2 Y3ZaTzdifxYnP2CdCRj4H2PO5Y1RPluoDZuwQ6bEwl3vSMGFE6q87v6v0ESd6HK7Ng/t 21kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=Fkf6FSy8DXH3PQdu3SmizlzdHMKipsK70K9nNf041Sc=; b=gjDMDGIVzb7GWP7rxlFL1ZiTC3Ohp/uf7qU0TQmchMkiMn5364CUCBS9WB6f+ECUAP VILXGaybEQY6XQ68f2XpqdYoWnMgk8Vnjh53VVcuSVne3pDpHQUZxVURMAFi7y69n7OX bYRdjTsNNuZHHNEbtTxUQu8EZq+4ZEyw14M1hrwBuKG/ePaejdJcKeoYjGodH+lQYBll DgyL09Epg+DkcMUdFPUVVTeeS7DnBn4noM7oydIuy/xoTPqri/cj+0o6xzLu/CwALjy1 2KS9tVJaKhF5RGxHRKyvVLYV5w4pPtGvhdgzE2/YmbuaiUNqErGpkvY6LHqEzKSb5VCy TGgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=W6hiGZ0m; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s22si6131684pfh.396.2018.01.18.13.03.47; Thu, 18 Jan 2018 13:03:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=W6hiGZ0m; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932495AbeARVDq (ORCPT + 10 others); Thu, 18 Jan 2018 16:03:46 -0500 Received: from mail-by2nam01on0133.outbound.protection.outlook.com ([104.47.34.133]:39600 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932411AbeARVDm (ORCPT ); Thu, 18 Jan 2018 16:03:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Fkf6FSy8DXH3PQdu3SmizlzdHMKipsK70K9nNf041Sc=; b=W6hiGZ0mq0Tfxb6jyEXPTktbu0mdNltm2UXA/o6S0g9nNmzy+3DtZ2TrFW0xIgHuOK5bHo0uYchbfJZ8BOttTTilV9xkZkcZRkdnQjo8ZKlyhrdeyZdXZqD+eVceKGP2BzV0hz/LWiJZTCzUxYHZCVTJq8E/o9vSFuPVu1RXUc8= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0805.namprd21.prod.outlook.com (10.167.105.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.428.7; Thu, 18 Jan 2018 21:03:40 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7%2]) with mapi id 15.20.0428.008; Thu, 18 Jan 2018 21:03:40 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Daniel Thompson , Jason Wessel , Sasha Levin Subject: [added to the 4.1 stable tree] kdb: Fix handling of kallsyms_symbol_next() return value Thread-Topic: [added to the 4.1 stable tree] kdb: Fix handling of kallsyms_symbol_next() return value Thread-Index: AQHTkJ9r91IJcvAb0E6Okl0k3AHotQ== Date: Thu, 18 Jan 2018 21:00:49 +0000 Message-ID: <20180118205908.3220-161-alexander.levin@microsoft.com> References: <20180118205908.3220-1-alexander.levin@microsoft.com> In-Reply-To: <20180118205908.3220-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [167.220.60.9] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0805; 7:Ysh/dmuZ7IABYtETZ2nWTQ9s7O+0tbpH8jnyKDrhX7bYieR3DCIdSqx32Wm+7csblyUEREkErWp5VPLICW7aZ4m/TfabK/lEZd4mGuQQzM+2Lq7AcaroNefiMez3sI//dPKKjLLsJlZl3MCN9yA0R02lcDD4e7ynGmttBWdR/kjyPQ5D51qhuiP+6Zu5edxN+kKpJXY+CFu0SDlTtP47rNBhoeAeIpHhjfOcSpZUy4p8/WS+LW5Obck6o0bEdSwd x-ms-office365-filtering-correlation-id: c7d8c5b0-0027-4610-6695-08d55eb6f36d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020); SRVR:DM5PR2101MB0805; x-ms-traffictypediagnostic: DM5PR2101MB0805: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(9452136761055)(146099531331640); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(61425038)(6040495)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231046)(2400067)(944501161)(3002001)(6055026)(61426038)(61427038)(6041282)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB0805; BCL:0; PCL:0; RULEID:(100000803126)(100110400120); SRVR:DM5PR2101MB0805; x-forefront-prvs: 05568D1FF7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(39380400002)(366004)(376002)(346002)(396003)(189003)(199004)(2906002)(2900100001)(6512007)(86362001)(305945005)(97736004)(68736007)(10090500001)(2501003)(7736002)(105586002)(5250100002)(2950100002)(5660300001)(6116002)(36756003)(6486002)(26005)(86612001)(54906003)(4326008)(3280700002)(3846002)(6346003)(6436002)(3660700001)(10290500003)(478600001)(107886003)(76176011)(66066001)(1076002)(81156014)(99286004)(81166006)(106356001)(53936002)(102836004)(22452003)(110136005)(59450400001)(14454004)(316002)(72206003)(25786009)(6506007)(8676002)(8936002)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0805; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: I8uiNYuBJqngZezT+HqcnTcE4ZnvQJXKUOnUw1oU8n/Jzb8AeU7echv8OOXE3EyW1BNjm6SS8kagCRt6RgC4Nw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7d8c5b0-0027-4610-6695-08d55eb6f36d X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 21:00:49.8526 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0805 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Daniel Thompson This patch has been added to the stable tree. If you have any objections, please let us know. -- 2.11.0 =============== [ Upstream commit c07d35338081d107e57cf37572d8cc931a8e32e2 ] kallsyms_symbol_next() returns a boolean (true on success). Currently kdb_read() tests the return value with an inequality that unconditionally evaluates to true. This is fixed in the obvious way and, since the conditional branch is supposed to be unreachable, we also add a WARN_ON(). Reported-by: Dan Carpenter Signed-off-by: Daniel Thompson Cc: linux-stable Signed-off-by: Jason Wessel Signed-off-by: Sasha Levin --- kernel/debug/kdb/kdb_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c index fc1ef736253c..77777d918676 100644 --- a/kernel/debug/kdb/kdb_io.c +++ b/kernel/debug/kdb/kdb_io.c @@ -349,7 +349,7 @@ static char *kdb_read(char *buffer, size_t bufsize) } kdb_printf("\n"); for (i = 0; i < count; i++) { - if (kallsyms_symbol_next(p_tmp, i) < 0) + if (WARN_ON(!kallsyms_symbol_next(p_tmp, i))) break; kdb_printf("%s ", p_tmp); *(p_tmp + len) = '\0';