From patchwork Fri Jan 23 16:08:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 5695511 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1B5609F8B6 for ; Fri, 23 Jan 2015 16:09:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 550C42015A for ; Fri, 23 Jan 2015 16:09:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 87CD0201B4 for ; Fri, 23 Jan 2015 16:09:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755973AbbAWQJa (ORCPT ); Fri, 23 Jan 2015 11:09:30 -0500 Received: from mail-lb0-f179.google.com ([209.85.217.179]:65420 "EHLO mail-lb0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755939AbbAWQJV (ORCPT ); Fri, 23 Jan 2015 11:09:21 -0500 Received: by mail-lb0-f179.google.com with SMTP id 10so6602880lbg.10; Fri, 23 Jan 2015 08:09:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nJMA/UGWQP/71OhSWnzp4JkK8r2K8SVqm+7EEHnScNk=; b=XDYWjg+/PumZUkzGfA3n9bb19v7vKI+RKMCg9A1ADcCdQFFH+LuOwOkJ409DA7eBdb RUQwk07hbGZvI6gh6vvQYasAHm0BvAo7Og6uXYQR2coKyjAnjjvl8lXVLveB5xnhFsMa UiUXFZzkUYv58WsOtRdH/1jowzVnRsOjesomhBKbxMg+pKFqMKnrCR5gpayXeNQ9/+55 et9z4z+3GnYIB66/TDm1lHbT8zW76s63pMb1wIh60M494g6SZ++k3N8c3dexgniaMAqt ADy24KD1N3v5v7mEQlVBXIEQB5YtDgGsAusksCXOk39RKveAU4FbRqgpVsqd83ddLJq9 25Wg== X-Received: by 10.112.156.132 with SMTP id we4mr8063614lbb.59.1422029359863; Fri, 23 Jan 2015 08:09:19 -0800 (PST) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by mx.google.com with ESMTPSA id h7sm542990lbl.41.2015.01.23.08.09.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Jan 2015 08:09:18 -0800 (PST) From: Ricardo Ribalda Delgado To: Mark Brown , Michal Simek , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH 18/18] spi/xilinx: Check number of slaves range Date: Fri, 23 Jan 2015 17:08:50 +0100 Message-Id: <1422029330-10971-19-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1422029330-10971-1-git-send-email-ricardo.ribalda@gmail.com> References: <1422029330-10971-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The core only supports up to 32 slaves, and the chipselect function expects the same. Signed-off-by: Ricardo Ribalda Delgado --- drivers/spi/spi-xilinx.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index 026f4c5..134d8cd 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -22,6 +22,8 @@ #include #include +#define MAX_CS 32 + #define XILINX_SPI_NAME "xilinx_spi" /* Register definitions as per "OPB Serial Peripheral Interface (SPI) (v1.00e) @@ -340,6 +342,11 @@ static int xilinx_spi_probe(struct platform_device *pdev) return -EINVAL; } + if (num_cs > MAX_CS) { + dev_err(&pdev->dev, "Invalid number of spi slaves\n"); + return -EINVAL; + } + master = spi_alloc_master(&pdev->dev, sizeof(struct xilinx_spi)); if (!master) return -ENODEV;