From patchwork Wed Aug 17 19:09:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9286357 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2CD316086A for ; Wed, 17 Aug 2016 19:12:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A5EA29089 for ; Wed, 17 Aug 2016 19:12:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0EF652958B; Wed, 17 Aug 2016 19:12:20 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 B67D629089 for ; Wed, 17 Aug 2016 19:12:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752406AbcHQTMS (ORCPT ); Wed, 17 Aug 2016 15:12:18 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36791 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752469AbcHQTMQ (ORCPT ); Wed, 17 Aug 2016 15:12:16 -0400 Received: by mail-wm0-f68.google.com with SMTP id i138so123053wmf.3 for ; Wed, 17 Aug 2016 12:11:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=A+R0GKmJkZc0zNI5N7SK6Y5WEt2XYNvWcYH9tufUJxU=; b=ug99xH7ucYry3sSGKARDbmSBDa5bMnzPIO9bk6gsW1JMG/kwZfskUOR1db6zulCcTU RKdIT7WdD/NevrXaz8Rchd8qV8j/6mADfkpcAe9hXSTHntspUyNehBfjJpp8567pegxG kZQhqG1w5CpDkd+3jd6CT68DbJkU7MeJtkDJGSMKyg6Pqt+k9QLR5dFoI0g6zPa2tPGz E4UMrdViiA0JzXl5mcmliRtKUaQ5ragUWyNbIpE8cXpkoEmTT84wDQmlszEQyNzzvT70 I9jGv1ih1mierPbcdJz2OjQoAqWmYzaK2oTf4pOaJZUnyrpTh364G3H4f40UG4y4dYxi qy0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=A+R0GKmJkZc0zNI5N7SK6Y5WEt2XYNvWcYH9tufUJxU=; b=iPheI8qMmPSuU+Z/GZqH4WLktkd50O5MxSQujc1txOAI+HUhcZJch+RcdjSX5a8ZaE zpRY3m/blfT1VbIp7QLt5e5UjN+CE7GV3iMQduRKCR+32ZVxdbL7eLFdjtdmfvG9p3q/ LuwwmRomcLwm4ldRYWfC4jRDyXfC5I5Gt/MrvNOGP4L2mVYFoLCyZ22IkEv2KzDx+is9 itgTkfxOOIg07nioe3lxP4JUZeW5OGQN21rNgUhPePxIGHDO2dqH8XD17XMr77oOJLgC U5rOgOBXMpzhIXOFXDclk4yFn9M+aSSzfx59dtvLxtsldyL6/+u4nZgmebvRWbPwb/W8 eu+w== X-Gm-Message-State: AEkoouvYeXQk3TNYrIM/qxjjsPbiT9vHeup40ojRurJuMbkQ9FoGdsJhyvw0krIjMAS85A== X-Received: by 10.28.29.215 with SMTP id d206mr28213598wmd.75.1471461116960; Wed, 17 Aug 2016 12:11:56 -0700 (PDT) Received: from ?IPv6:2003:62:5f55:2b00:2875:7515:2c1f:41b3? (p200300625F552B00287575152C1F41B3.dip0.t-ipconnect.de. [2003:62:5f55:2b00:2875:7515:2c1f:41b3]) by smtp.googlemail.com with ESMTPSA id t202sm27881986wmt.22.2016.08.17.12.11.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Aug 2016 12:11:56 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v2 2/3] mtd: m25p80: consider max message size in m25p80_read To: Mark Brown , Brian Norris References: <6c95366c-7fcc-ef4c-033a-f9f6e152a669@gmail.com> <20160816164204.GV9347@sirena.org.uk> Cc: "linux-spi@vger.kernel.org" , MTD Maling List Message-ID: Date: Wed, 17 Aug 2016 21:09:48 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20160816164204.GV9347@sirena.org.uk> 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 Consider a message size limit when calculating the maximum amount of data that can be read. Signed-off-by: Heiner Kallweit Reviewed-by: Cyrille Pitchen --- v2: - use the new function spi_max_message_size --- drivers/mtd/devices/m25p80.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 9cf7fcd..16a7df2 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -172,7 +172,8 @@ static ssize_t m25p80_read(struct spi_nor *nor, loff_t from, size_t len, t[1].rx_buf = buf; t[1].rx_nbits = m25p80_rx_nbits(nor); - t[1].len = min(len, spi_max_transfer_size(spi)); + t[1].len = min3(len, spi_max_transfer_size(spi), + spi_max_message_size(spi) - t[0].len); spi_message_add_tail(&t[1], &m); ret = spi_sync(spi, &m);