From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D98DDC43141 for ; Fri, 22 Nov 2019 06:27:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A27352071B for ; Fri, 22 Nov 2019 06:27:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574404028; bh=efje1ZhyiC3VPDJkQ01pBKauyaU20c2yrRgBi42Ebhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=F+3wLQHfOeJSMMFbmwljKst+1lGM/g4gUiEu5VovPiSCV3YLqaIvVhOnsrNUeBF6X VfCVwoX2p6BqHDcAWYnk3sgcAcZ9mIteKESMgQfVpt/gbg3+CCTY22Mv6TzFoj1Upd nLFGjLKUz9HPpirmqCJB0A5gzSZdZXhEvmH8jnf4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727864AbfKVG1D (ORCPT ); Fri, 22 Nov 2019 01:27:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:55218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727783AbfKVFuf (ORCPT ); Fri, 22 Nov 2019 00:50:35 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9F77C20731; Fri, 22 Nov 2019 05:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574401835; bh=efje1ZhyiC3VPDJkQ01pBKauyaU20c2yrRgBi42Ebhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kOsvhJjT8IB25ffALcA12OHJF7PWJMIoIzaT7jwr+Y/9+OSoTfvbV5KjXYQq2P6l4 nUdZxb90Jgf357s+awqDLkzoWWw0zcKVTLZ/CvTcZ2vRo2BgnNP9aFHycsFwLJU1An mxseKc/6dwDmBF1HGBK3pdZ/2khS885r0xlvFaLU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Geert Uytterhoeven , Greg Kroah-Hartman , Sasha Levin , linux-serial@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 076/219] serial: sh-sci: Fix crash in rx_timer_fn() on PIO fallback Date: Fri, 22 Nov 2019 00:46:48 -0500 Message-Id: <20191122054911.1750-69-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122054911.1750-1-sashal@kernel.org> References: <20191122054911.1750-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org From: Geert Uytterhoeven [ Upstream commit 2e948218b7c1262a3830823d6620eb227e3d4e3a ] When falling back to PIO, active_rx must be set to a different value than cookie_rx[i], else sci_dma_rx_find_active() will incorrectly find a match, leading to a NULL pointer dereference in rx_timer_fn() later. Use zero instead, which is the same value as after driver initialization. Signed-off-by: Geert Uytterhoeven Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/sh-sci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 5550289e6678b..9e1a6af23ca2b 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1359,7 +1359,7 @@ static int sci_submit_rx(struct sci_port *s, bool port_lock_held) dmaengine_terminate_async(chan); for (i = 0; i < 2; i++) s->cookie_rx[i] = -EINVAL; - s->active_rx = -EINVAL; + s->active_rx = 0; s->chan_rx = NULL; sci_start_rx(port); if (!port_lock_held) -- 2.20.1