From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f66.google.com ([209.85.160.66]:39163 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729720AbeGQIux (ORCPT ); Tue, 17 Jul 2018 04:50:53 -0400 Received: by mail-pl0-f66.google.com with SMTP id p23-v6so135173plo.6 for ; Tue, 17 Jul 2018 01:19:29 -0700 (PDT) From: Amit Pundir To: Greg KH , Stable Cc: Heiner Kallweit , Cyrille Pitchen Subject: [PATCH for-4.9.y 1/5] mtd: m25p80: consider max message size in m25p80_read Date: Tue, 17 Jul 2018 13:49:14 +0530 Message-Id: <1531815558-20002-2-git-send-email-amit.pundir@linaro.org> In-Reply-To: <1531815558-20002-1-git-send-email-amit.pundir@linaro.org> References: <1531815558-20002-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org List-ID: From: Heiner Kallweit commit 9e276de6a367cde07c1a63522152985d4e5cca8b upstream. Consider a message size limit when calculating the maximum amount of data that can be read. The message size limit has been introduced with 4.9, so cc it to stable. Signed-off-by: Heiner Kallweit Signed-off-by: Cyrille Pitchen Signed-off-by: Amit Pundir --- Cherry-picked from lede tree https://git.lede-project.org/?p=source.git 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 9cf7fcd28034..16a7df2a0246 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); -- 2.7.4