diff mbox series

[07/20] can: rcar_can: Fix erroneous registration

Message ID	20181112115728.18331-8-mkl@pengutronix.de
State	Accepted, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Marc Kleine-Budde <mkl@pengutronix.de> To: netdev@vger.kernel.org Cc: davem@davemloft.net, linux-can@vger.kernel.org, kernel@pengutronix.de, Fabrizio Castro <fabrizio.castro@bp.renesas.com>, Chris Paterson <Chris.Paterson2@renesas.com>, Marc Kleine-Budde <mkl@pengutronix.de> Subject: [PATCH 07/20] can: rcar_can: Fix erroneous registration Date: Mon, 12 Nov 2018 12:57:15 +0100 Message-Id: <20181112115728.18331-8-mkl@pengutronix.de> In-Reply-To: <20181112115728.18331-1-mkl@pengutronix.de> References: <20181112115728.18331-1-mkl@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	pull-request: can 2018-11-09 \| expand pull-request: can 2018-11-09 [02/20] can: kvaser_usb: Fix potential uninitialized variable use [03/20] can: kvaser_usb: Fix accessing freed memory in kvaser_usb_start_xmit() [04/20] can: ucan: remove set but not used variable 'udev' [05/20] can: ucan: remove duplicated include from ucan.c [06/20] dt-bindings: can: rcar_can: document r8a77965 support [07/20] can: rcar_can: Fix erroneous registration [08/20] dt-bindings: can: rcar_can: Add r8a774a1 support [09/20] can: hi311x: Use level-triggered interrupt [10/20] can: flexcan: Unlock the MB unconditionally [11/20] can: flexcan: Always use last mailbox for TX [12/20] can: flexcan: remove not needed struct flexcan_priv::tx_mb and struct flexcan_priv::tx_mb_i… [13/20] can: dev: can_get_echo_skb(): factor out non sending code to __can_get_echo_skb() [14/20] can: dev: __can_get_echo_skb(): replace struct can_frame by canfd_frame to access frame len… [15/20] can: dev: __can_get_echo_skb(): Don't crash the kernel if can_priv::echo_skb is accessed ou… [16/20] can: dev: __can_get_echo_skb(): print error message, if trying to echo non existing skb [17/20] can: rx-offload: introduce can_rx_offload_get_echo_skb() and can_rx_offload_queue_sorted() … [18/20] can: flexcan: handle tx-complete CAN frames via rx-offload infrastructure [19/20] can: rx-offload: rename can_rx_offload_irq_queue_err_skb() to can_rx_offload_queue_tail() [20/20] can: flexcan: use can_rx_offload_queue_sorted() for flexcan_irq_bus_*()

Commit Message

Marc Kleine-Budde Nov. 12, 2018, 11:57 a.m. UTC

From: Fabrizio Castro <fabrizio.castro@bp.renesas.com>

Assigning 2 to "renesas,can-clock-select" tricks the driver into
registering the CAN interface, even though we don't want that.
This patch improves one of the checks to prevent that from happening.

Fixes: 862e2b6af9413b43 ("can: rcar_can: support all input clocks")
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Chris Paterson <Chris.Paterson2@renesas.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/rcar/rcar_can.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
index 11662f479e76..771a46083739 100644
--- a/drivers/net/can/rcar/rcar_can.c
+++ b/drivers/net/can/rcar/rcar_can.c
@@ -24,6 +24,9 @@ 
 
 #define RCAR_CAN_DRV_NAME	"rcar_can"
 
+#define RCAR_SUPPORTED_CLOCKS	(BIT(CLKR_CLKP1) | BIT(CLKR_CLKP2) | \
+				 BIT(CLKR_CLKEXT))
+
 /* Mailbox configuration:
  * mailbox 60 - 63 - Rx FIFO mailboxes
  * mailbox 56 - 59 - Tx FIFO mailboxes
@@ -789,7 +792,7 @@  static int rcar_can_probe(struct platform_device *pdev)
 		goto fail_clk;
 	}
 
-	if (clock_select >= ARRAY_SIZE(clock_names)) {
+	if (!(BIT(clock_select) & RCAR_SUPPORTED_CLOCKS)) {
 		err = -EINVAL;
 		dev_err(&pdev->dev, "invalid CAN clock selected\n");
 		goto fail_clk;