From patchwork Tue Jul 17 08:19:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 142118 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3369001ljj; Tue, 17 Jul 2018 01:19:30 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfKmv9A87skukrbpLHPkrEWKp2HvjhOun/pKRslfgpcsN95yEPIMmWxxe7/gt1TdFWDY18n X-Received: by 2002:a62:700a:: with SMTP id l10-v6mr664771pfc.71.1531815570657; Tue, 17 Jul 2018 01:19:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531815570; cv=none; d=google.com; s=arc-20160816; b=UOC8w9eqLY8bNzIHD9Yx1b7e5jYD+eyNHg39HIDVekBvT4DjcTSPSdzcHdRBLBCrlk yz/mRiN1FR+wdo9MaO5W+tJZsccyGXp0OylP6GASc1LTqxStvh6QL6OX/3t3V3hyIbj5 9B4VzRJJYUgQRWnGOPC8pZ9qe5mLb+GWV/kL08Syhwxw0GvG6/QjACQEMnd1Xa0i5JX4 pArSt3+swlG3r4VTpbsV9D4WLKLQfLlIGsBfNznxXDRyiOxnZ761SYOPX1t6omCcz4X7 EzIiE99F7yPzcJm3ZZACEa9yXUYf05f7FIpn6vpQZz1guYgbqFqsphp0V4zMwns00mcf J4DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=7xRLEybNMjlvvNefoO6yHuidE/cF93NioAPk1EdA6lY=; b=jiFvK5iyPIH/pGZDWkD6rnyBRcI5A7p6PUIbB3SrutUIdCWnhaP3PocrOcm1E4FCFr JrE6s0dwqFJ6TCzIqugrgPhyGfaYmJJUHvla3a/QSdWB0nyTAQiB205XdkN+JEcTv8bL ce4oysXdJZnX7dt7SQkfSbcTw1PFXP4w1QxzrWlhCPsG6bCQ8HRsbOnY95cS2k2A9R91 qMfNLJ6MyEvcyCN/mS7cen6xzVAfRlqNLrQMMsZWWaGn/3nMURmDfEiSMsEh4JZqBRcN L7+hdbDm6KSjrKE+ixpMdCWKqYxSpLk74OSpcrFrtX4PW7TQBUUCMh5ZZ8+QTdTS6IjN 60dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zx8T8Cmx; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 37-v6si391179pgy.118.2018.07.17.01.19.30; Tue, 17 Jul 2018 01:19:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zx8T8Cmx; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728067AbeGQIuy (ORCPT + 13 others); Tue, 17 Jul 2018 04:50:54 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7xRLEybNMjlvvNefoO6yHuidE/cF93NioAPk1EdA6lY=; b=Zx8T8CmxCITsgEKnb+xkRWsSd4TpfskmdCm++PMkQJLj0RYKOX9PsKS41PNy2lc5V+ 2qVPo42TToB3vD5x9Vly7ML7f9GQDc+wkEXu/5GAOtILOKqmD9rOjAP7R1WZcYxRrfVg taDr/LM6CXPRoG+PzIHBlYo4eoe2Vj6UoUQis= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7xRLEybNMjlvvNefoO6yHuidE/cF93NioAPk1EdA6lY=; b=ZlBk3D3Zj3Uy7F/H3pJgiTlEWdB4I/WH7eQP6EhoBuzwRKh9Pdlrihp/2+qa6vREuJ X+9xpFScp8PXONwmZ2smjFtFBn0cMoBAwp0NGMW3xr3NADykRHwB1I3XqtKOqQu1dS4y SPP4jwJ3UQ7cvs/N4H/U9iyskMyKy3G8eFNaoVRGWuu1iIcefJYVzmizc1mPDoMEVPFz PFideTLEpJCyZPoIGJ1Xj/4WoWwvhaopYUsVqHOQHqOP6jKuqjmP4S4pXll3lv3cE/NR 01asz0JcHwSkG3hsc0jFyA81hyxtUPfDNp0ENgzK/nfQ2kARqtLc6h0MFrbDqNAFiHO6 c2Pg== X-Gm-Message-State: AOUpUlH4RylpbT3jGMyCtFELlkZZH6KaQ9cw4PNvSqXtL8AueHqj7KWU 2CabNT26sBlWB22I0jWu9+S4Hw== X-Received: by 2002:a17:902:5617:: with SMTP id h23-v6mr658545pli.324.1531815568655; Tue, 17 Jul 2018 01:19:28 -0700 (PDT) Received: from localhost.localdomain ([106.51.22.240]) by smtp.gmail.com with ESMTPSA id z2-v6sm740263pgv.12.2018.07.17.01.19.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jul 2018 01:19:27 -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> X-Mailer: git-send-email 2.7.4 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 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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(-) -- 2.7.4 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);