From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754182AbcDYJxX (ORCPT ); Mon, 25 Apr 2016 05:53:23 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:43755 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752383AbcDYJxV (ORCPT ); Mon, 25 Apr 2016 05:53:21 -0400 From: Vignesh R To: Mark Brown CC: , , , Vignesh R Subject: [PATCH v2 1/3] spi: return error if kmap'd buffers passed to spi_map_buf() Date: Mon, 25 Apr 2016 15:14:00 +0530 Message-ID: <1461577442-8853-2-git-send-email-vigneshr@ti.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461577442-8853-1-git-send-email-vigneshr@ti.com> References: <1461577442-8853-1-git-send-email-vigneshr@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Current spi_map_buf() implementation supports creates sg_table for vmalloc'd and kmalloc'd buffers. Therefore return error if kmap'd buffer (or any other buffer) is passed to spi_map_buf(). Signed-off-by: Vignesh R --- v2: New patch drivers/spi/spi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index a7ab330d0640..82126bbe69cf 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -717,9 +717,11 @@ static int spi_map_buf(struct spi_master *master, struct device *dev, if (vmalloced_buf) { desc_len = min_t(int, max_seg_size, PAGE_SIZE); sgs = DIV_ROUND_UP(len + offset_in_page(buf), desc_len); - } else { + } else if (virt_addr_valid(buf)) { desc_len = min_t(int, max_seg_size, master->max_dma_len); sgs = DIV_ROUND_UP(len, desc_len); + } else { + return -EINVAL; } ret = sg_alloc_table(sgt, sgs, GFP_KERNEL); -- 2.8.1