Message ID | 20181215122848.24906-3-peng.fan@nxp.com |
---|---|
State | Accepted |
Commit | ecab65e4cdec0ee408ca1ac9d0b06d2793fdae91 |
Delegated to: | Stefano Babic |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="G/ZqoW7s"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43H64Z4QM7z9s9h for <incoming@patchwork.ozlabs.org>; Sat, 15 Dec 2018 23:22:38 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id F153EC221A0; Sat, 15 Dec 2018 12:20:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 272F5C2215F; Sat, 15 Dec 2018 12:20:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 07D49C21E4F; Sat, 15 Dec 2018 12:19:54 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20064.outbound.protection.outlook.com [40.107.2.64]) by lists.denx.de (Postfix) with ESMTPS id 22B1EC220C6 for <u-boot@lists.denx.de>; Sat, 15 Dec 2018 12:19:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1ziJIFUDdCxW57VBEEz/ttwClukj3keqHADVdjeaquI=; b=G/ZqoW7s2ZeV5LVvAzhu5Xw7qyZfyO/opvefqSrfhWM1Kwu+IMOnelhPz+m5Ig/C+GnM859eROPbz63Z2O3IoxsVDPojRPwCaM2kxf0h8eApJNhoSsf3gejSUpEjg//pXGwY1G+GxFtwC0+qMqeSMO+btQPlExI4IKBcDjgrBSo= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.148.143) by AM0PR04MB4738.eurprd04.prod.outlook.com (20.176.214.223) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1425.22; Sat, 15 Dec 2018 12:19:49 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5507:f6c1:df5d:ba18]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5507:f6c1:df5d:ba18%3]) with mapi id 15.20.1425.021; Sat, 15 Dec 2018 12:19:49 +0000 From: Peng Fan <peng.fan@nxp.com> To: "sbabic@denx.de" <sbabic@denx.de> Thread-Topic: [PATCH 2/5] misc: imx: scu: avoid write null pointer Thread-Index: AQHUlHB5WBzzNecWLkq7hHQPWFdlbw== Date: Sat, 15 Dec 2018 12:19:49 +0000 Message-ID: <20181215122848.24906-3-peng.fan@nxp.com> References: <20181215122848.24906-1-peng.fan@nxp.com> In-Reply-To: <20181215122848.24906-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.14.1 x-clientproxiedby: HK2P15301CA0006.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::16) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:73::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [92.121.68.129] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB4738; 6:4Rs3tYSb6Jj3F8iuHC8TIdAJCRW5xWyPDkiMKSqZLTb4l8NMebrIKAYG5S9LD859vEON/2Br7HyOTdjTkf9hhj0WVuUs76VYDZSZrf3BCb/ocJdijsqbyIreFNtJTEfXAU5mCaWz9a0qamcIlViwOyFY2XKjsYYy6oy4le0ewa1viA17RZkLAHNEgJVbEPWJ72qYSahtql6up2hhpxwQs1snqpLV4K3Wk8BaLOknnJC+tus9TCALDE3PX9fpNCs5a23fILI1OC0L6SK/0jUa2gsA7Ags8SLYx4jVvFdtadjGo1FmycCFUteD9JTPEBaP0L3GmCZgbEnH/u21kMnJHjWaSrw5KSvzOjwb2Ma49OVMNR/G6D14QWX36MaMbn3dVD8qg9AiYnoyLaWx/2cGNS3B8NlCoqGKHQ146pt8RpK1xebGTBjYVrBUtNS2lpp29xFuO9z5Zaa6mFI6cxEAlw==; 5:pFjGB9aBWIOgs1VHmCkbcc6X9KE+VkYJ0n8YMfb0mkSOgyhpClJkMLIpGVM95WYnEEuZPGPJNtatCdQJt20CzGL/yvAuQj5Z6xb+cJM2l06cOzv8j1dabJukc09UEc3Boq7g/787rQULEdoTwLAy6nkBvE99cQzOZwRyQQw6GzQ=; 7:87T4yfGa/LudZGi7zF3xaBKZmdXUjN1WjuuFiL7fCBlOEtSvaiE+HBUsFXoOY3uAn5BMDEG1YXuElKcW/hlApMCuS7Y6F/IaW4iTluO3YtBqxKM8rgPq4+rJEoK0zRNJ37/o4UUSTll1o04B0VbxFw== x-ms-office365-filtering-correlation-id: e0fc51cd-79a7-4bcc-7eef-08d662879bc5 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4738; x-ms-traffictypediagnostic: AM0PR04MB4738: x-microsoft-antispam-prvs: <AM0PR04MB47385798838004D5D91CB1AA88A20@AM0PR04MB4738.eurprd04.prod.outlook.com> x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(999002)(6040522)(2401047)(8121501046)(5005006)(3231475)(944501520)(52105112)(93006095)(93001095)(3002001)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:AM0PR04MB4738; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4738; x-forefront-prvs: 088751B4D4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(366004)(376002)(136003)(396003)(39860400002)(199004)(189003)(6512007)(4326008)(68736007)(3846002)(486006)(6116002)(54906003)(11346002)(2616005)(476003)(99286004)(446003)(25786009)(44832011)(256004)(52116002)(305945005)(316002)(5640700003)(2501003)(2351001)(66066001)(2906002)(1076002)(26005)(7736002)(5660300001)(8936002)(50226002)(6436002)(102836004)(6916009)(76176011)(97736004)(8676002)(71190400001)(14454004)(6506007)(71200400001)(386003)(86362001)(6486002)(81156014)(1730700003)(81166006)(36756003)(106356001)(478600001)(186003)(53936002)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4738; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: TPqEMc31rL+1ik+WZGwyw6Y7ECT1xCcsUIdrD2MdniFJXr+Gsurw7JAH/yoqlbZ0p9DvkDm5m5qttCC/CZtkNYoir8HL+50dC3bicZUAMq2W+TsJh7tuOSimCd4J0/IZDDmxu3sepzZOU0XvyvOuDDqwFSZHoLxgveZ0o/vEficnGF4fz8wOCIfJw/sjCobhfmXVj/KBLRRK7bh6/FH0zKiiNtLabIQAeFgMOrSzQ3wTW7EhBMANSGtM/6OV86dU/q/NHyqU6rzEdtUzqZiQiRbfrHny2Tmc+aNswEoZPN7lvl7gubqYoe8zipbxsiA3 spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0fc51cd-79a7-4bcc-7eef-08d662879bc5 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Dec 2018 12:19:49.7465 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4738 Cc: Fabio Estevam <fabio.estevam@nxp.com>, "u-boot@lists.denx.de" <u-boot@lists.denx.de>, dl-uboot-imx <uboot-imx@nxp.com> Subject: [U-Boot] [PATCH 2/5] misc: imx: scu: avoid write null pointer X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
Series |
imx8: several fixes
|
expand
|
diff --git a/drivers/misc/imx8/scu_api.c b/drivers/misc/imx8/scu_api.c index 65080d7544..d9c4d5d784 100644 --- a/drivers/misc/imx8/scu_api.c +++ b/drivers/misc/imx8/scu_api.c @@ -169,7 +169,7 @@ int sc_misc_get_control(sc_ipc_t ipc, sc_rsrc_t resource, sc_ctrl_t ctrl, printf("%s: ctrl:%d resource:%d: res:%d\n", __func__, ctrl, resource, RPC_R8(&msg)); - if (!val) + if (val) *val = RPC_U32(&msg, 0U); return ret; @@ -194,7 +194,7 @@ void sc_misc_get_boot_dev(sc_ipc_t ipc, sc_rsrc_t *boot_dev) if (ret) printf("%s: res:%d\n", __func__, RPC_R8(&msg)); - if (!boot_dev) + if (boot_dev) *boot_dev = RPC_U16(&msg, 0U); }
When boot_dev is true, fill boot device. However the original logic is when boot_dev is false, fill boot device, this will trigger data abort. Also fix sc_misc_get_control when using pointer val. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/misc/imx8/scu_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)