From patchwork Thu Mar 7 20:39:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Lesiak X-Patchwork-Id: 10843843 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 821E7139A for ; Thu, 7 Mar 2019 20:39:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CD672DFB2 for ; Thu, 7 Mar 2019 20:39:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F9AC2E53E; Thu, 7 Mar 2019 20:39:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDB632DFB2 for ; Thu, 7 Mar 2019 20:39:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726185AbfCGUjE (ORCPT ); Thu, 7 Mar 2019 15:39:04 -0500 Received: from mail-eopbgr680135.outbound.protection.outlook.com ([40.107.68.135]:40935 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726207AbfCGUjE (ORCPT ); Thu, 7 Mar 2019 15:39:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=licor.onmicrosoft.com; s=selector1-licor-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BuLXkuUPnqpbezbHMty+BmE3mRHU9Q/p2Xr9t0Stiik=; b=1tvXvoJ0rqMFiT/Ct+vlSUSW4Onzyd4y+NIYEZGNRqoKGsRNjBnMH53Q9h/0qc9amL6AjqTSfAoLmb3fYN2ab4jf9k+GvipbpmswUSmtdvURDiEdPYiEWTUDARodg+aAgj6hoGxG0z1hwSUYuM21bzOFuX1TEpa/SwrlUIz+lZM= Received: from SN6PR08MB4768.namprd08.prod.outlook.com (52.135.102.13) by SN6PR08MB5582.namprd08.prod.outlook.com (20.177.254.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1686.16; Thu, 7 Mar 2019 20:39:00 +0000 Received: from SN6PR08MB4768.namprd08.prod.outlook.com ([fe80::45ea:e439:e470:e03f]) by SN6PR08MB4768.namprd08.prod.outlook.com ([fe80::45ea:e439:e470:e03f%3]) with mapi id 15.20.1665.021; Thu, 7 Mar 2019 20:39:00 +0000 From: Chris Lesiak To: Mark Brown CC: "linux-spi@vger.kernel.org" , Chris Lesiak Subject: [PATCH] spi: Fix zero length xfer bug Thread-Topic: [PATCH] spi: Fix zero length xfer bug Thread-Index: AQHU1SXLpLwGGfyZZ021oMqNbfPhbg== Date: Thu, 7 Mar 2019 20:39:00 +0000 Message-ID: <20190307203831.7274-1-chris.lesiak@licor.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [208.82.105.200] x-clientproxiedby: YTOPR0101CA0054.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b00:14::31) To SN6PR08MB4768.namprd08.prod.outlook.com (2603:10b6:805:6d::13) authentication-results: spf=none (sender IP is ) smtp.mailfrom=chris.lesiak@licor.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.2 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 56452c5b-6e0e-4fc6-9b5a-08d6a33cedc7 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020);SRVR:SN6PR08MB5582; x-ms-traffictypediagnostic: SN6PR08MB5582: x-microsoft-exchange-diagnostics: =?iso-8859-1?q?1=3BSN6PR08MB5582=3B23=3AXN?= =?iso-8859-1?q?wEN2jylQLdL6Lba9YweTpv5LOqhIUed4Q+1N649T/bn4Ta3geQDw/8NAHmeH?= =?iso-8859-1?q?b3r+SCCWQ7M3+ixM3i4/xG5GVJLqkUodjsoq3itflNG2/n8LLAFv098Q5uHG?= =?iso-8859-1?q?Br7QR2gYw8xRLiKWFyUBMz7R6w4+0AWsuaCqt+KLonLVAkzppowDZDy4+NdC?= =?iso-8859-1?q?JwBvu0ntBh8jup+M9hm9gwRmxkK3hkpzMpAIz1s+ClZoGtyLmXy5zAVKGg1z?= =?iso-8859-1?q?csWyFnKvlddrVyCcWA/ur7MAAmsDgt1aO1MViL4r3VrWEHsrA7PdYaCCdsW5?= =?iso-8859-1?q?rArcZJw3OOnOFUuzj5ADEnDSUnPUDo8m3CDaqLWVCRhr1MTkP43VCIsI9O4f?= =?iso-8859-1?q?hX2kDdoXyDgTrvqCfC/zh7aW32IYD094vibnhsARMOoYV+nbBEbJij2nM7/x?= =?iso-8859-1?q?Us7Xw478hfSp3v3smYTmPkPa9TEHoCc5qnbuz9CvjZJsEA4CWx84AhII6skD?= =?iso-8859-1?q?XSofLlH04Cz1IJfiwy8CZUxk+FGCDqHoS/d+3WUxg0pt7xfQEU0fRcbl696f?= =?iso-8859-1?q?uv55PrctlU/agv/RJUblNM9Xu6Hwk3ji1iQlBjjOhfR3+wWqoTwYtDgT9esN?= =?iso-8859-1?q?hVpwrYfur2xD1xKf1Y50qc+BRaZlR4hd24F3Its4G7U5odNzIDPZ4GddpQiA?= =?iso-8859-1?q?viMZ4KUD1l1F1rJ9Y7TEIcqoNa4xK/iFk7HfnlOmx3vABCI2oWhlNM+z9BtK?= =?iso-8859-1?q?7Auh8sMYKUuW/XYfUVnK+6FO9G4hzjnZMGSa3BQ92H6qMpTos6sizwN/1cxK?= =?iso-8859-1?q?/ceKgR4sW4g1umXlOdBQyBsr0t3nWuKSE1YGKdJFAoyq3sZBtT6O5Ze04BO6?= =?iso-8859-1?q?XGukm5U1gzYyTCS9i1pCG2GWcxHu2utNhjWfe18+A7ukKKeG8JesSLE8IFFk?= =?iso-8859-1?q?ksLP0DxCHGWk2nmBoHaUgU0yATruVSXMBitBJOPp0kZavLaotPb26D1wQGD/?= =?iso-8859-1?q?9OhXGRCyPpn6ElcBmbjOVeXRiwydWFkVOftZVE9NDIR73AGt4wmzcPLPS5+V?= =?iso-8859-1?q?JIqNAFY/+MKu+Ipeu/zEiggctih8A0zxti6b5cAJcq8nPk4YW9sLDBc3lHLr?= =?iso-8859-1?q?EODZltMkirkyfpev87Pgou58T9I+EXU4HmKSFp0JwQpbZaGGVlmbKsB3x5rw?= =?iso-8859-1?q?hiooOagIc5YVXqXnU0Qe45b4/UvlI4vIKZXBopZwiEQPmKsAz7ghg=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 096943F07A x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(376002)(366004)(396003)(136003)(39840400004)(199004)(189003)(6116002)(3846002)(106356001)(6506007)(386003)(97736004)(36756003)(44832011)(105586002)(486006)(53936002)(476003)(4326008)(107886003)(2616005)(25786009)(8936002)(5660300002)(6512007)(50226002)(86362001)(102836004)(6916009)(26005)(256004)(478600001)(316002)(186003)(1076003)(81166006)(8676002)(99286004)(54906003)(81156014)(14454004)(71200400001)(71190400001)(52116002)(68736007)(6436002)(305945005)(66066001)(7736002)(2906002)(6486002);DIR:OUT;SFP:1102;SCL:1;SRVR:SN6PR08MB5582;H:SN6PR08MB4768.namprd08.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: licor.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ZqKJoUZBW2LDLdE5Zw0bem3g6LzfH8ndVrbkAkfthqnFXm0aIlEH1qIh2mlywZs4mmqvneBvVfYwwoWbiwmxhT5HvAxTiMDhisAyQzVVL0CM60LMgXi9OspzKDJc5zXypxxbsLXJQ4DUxNrmEyJhKkGY16JXBWYqcgzUU2E93KZf4sdcglEsjw7u7vnz5anxmQ6MC+Knh6ih4GLxWEYnJToB1qQFMlbv+/pU8reoeEvj0lpTk/1avIDtt9J4+KiAFc8KbjznaKlFy0R2EvckVE8v7yfGXpYYV5K439D6wOrclAZzw39QamV59eD0Y19ePhSQU5HnD4BtiWFwiuFn6oT4hNshhliQUo25ZGDwnNNnt5FVsoud8zplsSKUtDQis0/mqCrYQy3lkiMKgc+Fuqp5L+ENbP8PAhhK+aRy9pw= MIME-Version: 1.0 X-OriginatorOrg: licor.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56452c5b-6e0e-4fc6-9b5a-08d6a33cedc7 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Mar 2019 20:39:00.5833 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 48c70abd-da5a-4c6c-86cb-5e003ca01574 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR08MB5582 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This fixes a bug for messages containing both zero length and unidirectional xfers. The function spi_map_msg will allocate dummy tx and/or rx buffers for use with unidirectional transfers when the hardware can only do a bidirectional transfer. That dummy buffer will be used in place of a NULL buffer even when the xfer length is 0. Then in the function __spi_map_msg, if he hardware can dma, the zero length xfer will have spi_map_buf called on the dummy buffer. Eventually, __sg_alloc_table is called and returns -EINVAL because nents == 0. This fix prevents the error by not using the dummy buffer when the xfer length is zero. Signed-off-by: Chris Lesiak --- drivers/spi/spi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9a7def7c3237..0632a32c1105 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1024,6 +1024,8 @@ static int spi_map_msg(struct spi_controller *ctlr, struct spi_message *msg) if (max_tx || max_rx) { list_for_each_entry(xfer, &msg->transfers, transfer_list) { + if (!xfer->len) + continue; if (!xfer->tx_buf) xfer->tx_buf = ctlr->dummy_tx; if (!xfer->rx_buf)