Message ID | e084ae6e-2d89-7d96-0ccf-da23cef00043@gmail.com |
---|---|
State | Accepted |
Headers | show
Return-Path: <linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sw0Gp02fsz9s2Q for <incoming@patchwork.ozlabs.org>; Fri, 14 Oct 2016 05:52:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=qeEp0kA8; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bul5e-0006u6-Li; Thu, 13 Oct 2016 18:50:50 +0000 Received: from mail-lf0-x242.google.com ([2a00:1450:4010:c07::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bul5a-0006mC-Ua for linux-mtd@lists.infradead.org; Thu, 13 Oct 2016 18:50:48 +0000 Received: by mail-lf0-x242.google.com with SMTP id b75so13940750lfg.3 for <linux-mtd@lists.infradead.org>; Thu, 13 Oct 2016 11:50:26 -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=qeEp0kA8dW0ftQzEWW6S2HYYHcyWxBjblqzUCPjfZscE7CeY/HM3I09+r82sIdqYvv MbeXQ/SqoYZk7F1VeImgRAzyOBJ9y3tcVfl13ectirg4G3vXz469tMtOPzyfFsL6xjTy AGd8q6zXa80VJwpIIqS4MlAxdKsq5hkwtTw0WlIbWTOOsn0xEAYwUVOzF5QuW8hYE0Qo hgjwSzGSTkPjCDsG+oyncd4GjNDLTBwl+qxS1rBBF0kY0LHMdhKqwuVRACY8wk3rECOv 1V6OqR6mKINeqrt/nAP1Egwqv5BsMp9A0clh1xdcSOPHPlLd2NY9a0mKeKF1OnItoAJw ofZQ== 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=XaaX51EbMQVjeIo/SePy8+vDsIha8D3ElxOslnKKnA7c+SmG4jDpc/WN68F125QVs5 PZQRwmXC2mT+bL4t5OV7lUb0GIvf0Js+GulVRrgRZyLQoczCcUamfY5aRQ/WyI9YYqyl uT0XsXq6EDrx0NCXMft4NYuIeOx5DU3GJbw7Y0pONU81ISQ0H5qvvSm+J6/22+0KZOeF 0bri1ZyAFrP7UHGvNr2+SrKHGZW2/w6ncGji0mFtQ9cNSTzKCiqzocOwErx0U6JYF8VA nEi/aj9tHzYl4FQNTbnsUCwqYMNmpSVS6I1LynLKmMih7TqGIdWyt/huFAKa+tMw7AMJ AQRA== X-Gm-Message-State: AA6/9RlIsLJVYlvqW2XXQVtGHY86SACIp1maWzOsBC9KMYvJGfPSORfvjAWwT2OJ7oJOzw== X-Received: by 10.25.158.143 with SMTP id h137mr11863717lfe.83.1476384624495; Thu, 13 Oct 2016 11:50:24 -0700 (PDT) Received: from ?IPv6:2003:62:5f3c:200:bdaa:2738:ca38:1963? (p200300625F3C0200BDAA2738CA381963.dip0.t-ipconnect.de. [2003:62:5f3c:200:bdaa:2738:ca38:1963]) by smtp.googlemail.com with ESMTPSA id g63sm4188994lji.45.2016.10.13.11.50.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2016 11:50:22 -0700 (PDT) From: Heiner Kallweit <hkallweit1@gmail.com> Subject: [PATCH v2 RESEND 2/3] mtd: m25p80: consider max message size in m25p80_read To: Brian Norris <computersforpeace@gmail.com> References: <6c95366c-7fcc-ef4c-033a-f9f6e152a669@gmail.com> <20160816164204.GV9347@sirena.org.uk> Message-ID: <e084ae6e-2d89-7d96-0ccf-da23cef00043@gmail.com> Date: Thu, 13 Oct 2016 20:50:09 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <20160816164204.GV9347@sirena.org.uk> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161013_115047_277503_DF5BE76A X-CRM114-Status: UNSURE ( 9.54 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c07:0:0:0:242 listed in] [list.dnswl.org] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (hkallweit1[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (hkallweit1[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list <linux-mtd.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-mtd/> List-Post: <mailto:linux-mtd@lists.infradead.org> List-Help: <mailto:linux-mtd-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=subscribe> Cc: Mark Brown <broonie@kernel.org>, MTD Maling List <linux-mtd@lists.infradead.org>, "linux-spi@vger.kernel.org" <linux-spi@vger.kernel.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org> Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
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);
Consider a message size limit when calculating the maximum amount of data that can be read. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- v2: - use the new function spi_max_message_size --- drivers/mtd/devices/m25p80.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)