From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3827928-1521494877-2-9304848627834195954 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.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', 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=1521494876; b=d0jSivo9T3bL1nyRxvxTQgucdOkCQf1pqwpyod+KEdTHRHX vjUyx2Vs7QiWWUAUbXmeInNqhWCIB1gfWLwvjByka8Wj4YBg2nvY4hS5I5MK/Et+ Lm/DGQFwKm/LNKTb3qM9b1G5JsEnQTlejuKxdHklJwT1Z7ExMEfZ+rbg4ECztCkZ GiIS1ILFP5jKLGkq0jh7XD+Ozbm8nE4mTAfEA/TvsMoGK18AFvn4XJY9yq8BdNVQ Rbpsa7plrkDSMXweqV+K4nUCvme2WUFJ2OCdzvX30SNhBWlzKFigo2s77WGPZsqE 5bsuYSbaHuXyFmIvJgLT45Ls5tZYcBb7l7kRQaw== 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=1521494876; bh=9Ahyjk yugYmqsr4PmlutrxSl0A9o0H81kf7smjdXQTU=; b=ZyZO8RZmspznN9wt7ZcQ8G 6KoWc3QoTEdmG74B4/gqN5xRjczoCLsadONQd6x6ZCT+ZL9pfCyX/AYQ27mlzNJ3 znbOBOR3Fe5+v4s86te3FusIN/vUWhCqH65wtdUBu16aaEu6S9HfZDRg/OP20L0j lGpNSle8UxQ+++lOpfouvoW3/QMI212D4mzOPMM4rVXcHwURw78W33JpfZgFOLdj zmE2phix6KhqGOu9ipMDVwng50epAvsh4U7kacFdGY2SzNaBiwsDIDyVxyfCXQgN eWr1OojOYXabe8Jkplf3CO6OHUSy5Z6nG8AafT86TvrhvAUPxnFL/Zwe1hMi/2/A == 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=Dsfy22+B 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-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdduhedtucdltddurdegtdefrddttddmucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffuthffkfhfjghitgfggghsphejsehtqhertddttddunecuhfhrohhmpefurghshhgrucfnvghvihhnuceotehlvgigrghnuggvrhdrnfgvvhhinhesmhhitghrohhsohhfthdrtghomheqnecukfhppedvtdelrddufedvrddukedtrdeijedphedvrdduieekrdehgedrvdehvddpfhgvkedtmeemfegulegsmeejlegvjeemleegvggsmeehugeivdenucfrrghrrghmpehinhgvthepvddtledrudefvddrudektddrieejpdhhvghlohepvhhgvghrrdhkvghrnhgvlhdrohhrghdpmhgrihhlfhhrohhmpeeoshhtrggslhgvqdhofihnvghrsehvghgvrhdrkhgvrhhnvghlrdhorhhgqecuuefqffgjpeekuefkvffokffogfcuuffkkgfgpeekiedvfeenucevlhhushhtvghrufhiiigvpeehud; 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=Dsfy22+B 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-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdduhedtucdltddurdegtdefrddttddmucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffuthffkfhfjghitgfggghsphejsehtqhertddttddunecuhfhrohhmpefurghshhgrucfnvghvihhnuceotehlvgigrghnuggvrhdrnfgvvhhinhesmhhitghrohhsohhfthdrtghomheqnecukfhppedvtdelrddufedvrddukedtrdeijedphedvrdduieekrdehgedrvdehvddpfhgvkedtmeemfegulegsmeejlegvjeemleegvggsmeehugeivdenucfrrghrrghmpehinhgvthepvddtledrudefvddrudektddrieejpdhhvghlohepvhhgvghrrdhkvghrnhgvlhdrohhrghdpmhgrihhlfhhrohhmpeeoshhtrggslhgvqdhofihnvghrsehvghgvrhdrkhgvrhhnvghlrdhorhhgqecuuefqffgjpeekuefkvffokffogfcuuffkkgfgpeekiedvfeenucevlhhushhtvghrufhiiigvpeehud; 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 S1032324AbeCSV1w (ORCPT ); Mon, 19 Mar 2018 17:27:52 -0400 Received: from mail-co1nam03on0122.outbound.protection.outlook.com ([104.47.40.122]:54448 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934797AbeCSQAM (ORCPT ); Mon, 19 Mar 2018 12:00:12 -0400 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Holger Brunck , Zhao Qiang , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 074/281] net/wan/fsl_ucc_hdlc: fix incorrect memory allocation Thread-Topic: [PATCH AUTOSEL for 4.9 074/281] net/wan/fsl_ucc_hdlc: fix incorrect memory allocation Thread-Index: AQHTv5s7uG8nPieWZUih+P+szrGiog== Date: Mon, 19 Mar 2018 15:59:16 +0000 Message-ID: <20180319155742.13731-74-alexander.levin@microsoft.com> References: <20180319155742.13731-1-alexander.levin@microsoft.com> In-Reply-To: <20180319155742.13731-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;DM5PR2101MB0869;7:E9W8iq23rDzY4t35lprGGBQJk6nIxdojdU26zicHnzq/ejMjC+F5Scc2UiYBKgeT5FVwaC2bo/T/fsxaHfEVoT/FuwO2XsVGZLwCLBg5Njj9P7kDl8j/RWb6zkab1JSMeSEXc2vpiDZFMO+JgL5Aw6JUtwPF7IetkW3veB6gY0Zx3pkYRES5rf2JcuzHdSE/EbMHm2SNqzVGafQG5FLn/OUcioamGt8OXjF4Vea8sDM+jZKDzFzysjV1bClUpwlv;20:MKu2KHZ4P8ziu0D/i9DZdn1cyS4f0Od7HePZSxVfRcHb62VyUHSiNTANV0xMHwLuNlTNxvWGlQDWX1Be1vhQNx1yPOQ+KGYjdZEcwwahIwcnARlpZBDJRl/fgUWVmfq9Ad6ovRp6T5GfzJH+/RfSsEGhVZ8jX3naKEv84+YZ/TI= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 07907ea7-ef54-4f5a-3856-08d58db278d1 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0869; x-ms-traffictypediagnostic: DM5PR2101MB0869: 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)(185117386973197); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011);SRVR:DM5PR2101MB0869;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0869; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(39380400002)(366004)(346002)(39860400002)(199004)(189003)(76176011)(6486002)(2950100002)(6666003)(2906002)(5660300001)(54906003)(14454004)(110136005)(7736002)(2501003)(10290500003)(106356001)(22452003)(3280700002)(5250100002)(305945005)(8656006)(25786009)(99286004)(107886003)(10090500001)(6436002)(26005)(97736004)(53936002)(86612001)(3846002)(6116002)(186003)(1076002)(8676002)(81156014)(81166006)(68736007)(102836004)(72206003)(3660700001)(8936002)(316002)(478600001)(4326008)(36756003)(6506007)(105586002)(66066001)(6512007)(2900100001)(575784001)(86362001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0869;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; x-microsoft-antispam-message-info: +axmsIEZWTakP6D7kEW6gX3nDwksmCHaou4DieUqiUX9SrhQrUUB7ib4Yo+vXw24MqI3fBu0hzG3yplASetWZCQQEn2392oumobOQjypnH3a1IGpaJ7zRaf7obV/iuSE46iYWTiKXktP1W3188JPOFrXOPm8UfCFuO/n9wb4XjIzZO2tPCv0M7eVcPv9X0vYYjRbSUsebEtyE6hNCMBU/Jr7OA5z9Fl+MgG1A9WMGfUu56ZtD2dlDJhogHCYMsgtoYm/ih/r2MF0t0ZkM1weKRqlZL4OSpXgJPYyKnnM6Meg2+tvi/Ik5LOuMJOG5lmhhP4YvxjiPmWQ3WBGp4XviQ== 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: 07907ea7-ef54-4f5a-3856-08d58db278d1 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 15:59:16.2979 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0869 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: Holger Brunck [ Upstream commit 5b8aad93c52bdda6a731cab8497998cfa0f2df07 ] We need space for the struct qe_bd and not for a pointer to this struct. Signed-off-by: Holger Brunck Cc: Zhao Qiang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/wan/fsl_ucc_hdlc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.= c index 4c49410c3a1b..dcd5ff43a946 100644 --- a/drivers/net/wan/fsl_ucc_hdlc.c +++ b/drivers/net/wan/fsl_ucc_hdlc.c @@ -137,7 +137,7 @@ static int uhdlc_init(struct ucc_hdlc_private *priv) priv->tx_ring_size =3D TX_BD_RING_LEN; /* Alloc Rx BD */ priv->rx_bd_base =3D dma_alloc_coherent(priv->dev, - RX_BD_RING_LEN * sizeof(struct qe_bd *), + RX_BD_RING_LEN * sizeof(struct qe_bd), &priv->dma_rx_bd, GFP_KERNEL); =20 if (!priv->rx_bd_base) { @@ -148,7 +148,7 @@ static int uhdlc_init(struct ucc_hdlc_private *priv) =20 /* Alloc Tx BD */ priv->tx_bd_base =3D dma_alloc_coherent(priv->dev, - TX_BD_RING_LEN * sizeof(struct qe_bd *), + TX_BD_RING_LEN * sizeof(struct qe_bd), &priv->dma_tx_bd, GFP_KERNEL); =20 if (!priv->tx_bd_base) { @@ -295,11 +295,11 @@ static int uhdlc_init(struct ucc_hdlc_private *priv) qe_muram_free(priv->ucc_pram_offset); free_tx_bd: dma_free_coherent(priv->dev, - TX_BD_RING_LEN * sizeof(struct qe_bd *), + TX_BD_RING_LEN * sizeof(struct qe_bd), priv->tx_bd_base, priv->dma_tx_bd); free_rx_bd: dma_free_coherent(priv->dev, - RX_BD_RING_LEN * sizeof(struct qe_bd *), + RX_BD_RING_LEN * sizeof(struct qe_bd), priv->rx_bd_base, priv->dma_rx_bd); free_uccf: ucc_fast_free(priv->uccf); @@ -688,7 +688,7 @@ static void uhdlc_memclean(struct ucc_hdlc_private *pri= v) =20 if (priv->rx_bd_base) { dma_free_coherent(priv->dev, - RX_BD_RING_LEN * sizeof(struct qe_bd *), + RX_BD_RING_LEN * sizeof(struct qe_bd), priv->rx_bd_base, priv->dma_rx_bd); =20 priv->rx_bd_base =3D NULL; @@ -697,7 +697,7 @@ static void uhdlc_memclean(struct ucc_hdlc_private *pri= v) =20 if (priv->tx_bd_base) { dma_free_coherent(priv->dev, - TX_BD_RING_LEN * sizeof(struct qe_bd *), + TX_BD_RING_LEN * sizeof(struct qe_bd), priv->tx_bd_base, priv->dma_tx_bd); =20 priv->tx_bd_base =3D NULL; --=20 2.14.1