From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753993AbbAaQ2W (ORCPT ); Sat, 31 Jan 2015 11:28:22 -0500 Received: from mail-am1on0136.outbound.protection.outlook.com ([157.56.112.136]:30144 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752095AbbAaQ2U (ORCPT ); Sat, 31 Jan 2015 11:28:20 -0500 From: Bhuvanchandra DV To: CC: , , , , Bhuvanchandra DV Subject: [PATCH] spi: fsl-dspi: Remove possible memory leak of 'chip' Date: Sat, 31 Jan 2015 22:03:25 +0530 Message-ID: <1422722005-1616-1-git-send-email-bhuvanchandra.dv@toradex.com> X-Mailer: git-send-email 2.2.2 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [106.51.240.1] X-ClientProxiedBy: HKNPR06CA0039.apcprd06.prod.outlook.com (10.141.16.29) To AMSPR05MB262.eurprd05.prod.outlook.com (10.242.95.19) Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:AMSPR05MB262; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004);SRVR:AMSPR05MB262; X-Forefront-PRVS: 0473A03F3F X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(229853001)(50226001)(2351001)(122386002)(46102003)(33646002)(42186005)(66066001)(47776003)(48376002)(86362001)(19580405001)(87976001)(19580395003)(40100003)(50986999)(62966003)(77156002)(77096005)(92566002)(36756003)(50466002)(110136001);DIR:OUT;SFP:1102;SCL:1;SRVR:AMSPR05MB262;H:dvb.localdomain;FPR:;SPF:None;MLV:sfv;LANG:en; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:AMSPR05MB262; X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2015 16:28:13.9741 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR05MB262 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move the check for spi->bits_per_word before allocation, to avoid memory leak. Signed-off-by: Dan Carpenter Signed-off-by: Bhuvanchandra DV --- drivers/spi/spi-fsl-dspi.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 4cda994..604b6d3 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -339,6 +339,13 @@ static int dspi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) struct fsl_dspi *dspi = spi_master_get_devdata(spi->master); unsigned char br = 0, pbr = 0, fmsz = 0; + if ((spi->bits_per_word >= 4) && (spi->bits_per_word <= 16)) { + fmsz = spi->bits_per_word - 1; + } else { + pr_err("Invalid wordsize\n"); + return -ENODEV; + } + /* Only alloc on first setup */ chip = spi_get_ctldata(spi); if (chip == NULL) { @@ -350,12 +357,6 @@ static int dspi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) chip->mcr_val = SPI_MCR_MASTER | SPI_MCR_PCSIS | SPI_MCR_CLR_TXF | SPI_MCR_CLR_RXF; - if ((spi->bits_per_word >= 4) && (spi->bits_per_word <= 16)) { - fmsz = spi->bits_per_word - 1; - } else { - pr_err("Invalid wordsize\n"); - return -ENODEV; - } chip->void_write_data = 0; -- 2.2.2