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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 47F71C43381 for ; Thu, 14 Mar 2019 07:18:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 135752184C for ; Thu, 14 Mar 2019 07:18:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="M1yj+fuo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726677AbfCNHSJ (ORCPT ); Thu, 14 Mar 2019 03:18:09 -0400 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:54030 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726530AbfCNHSJ (ORCPT ); Thu, 14 Mar 2019 03:18:09 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id A635DC91 for ; Thu, 14 Mar 2019 07:18:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Nydv4Vjip4Ln for ; Thu, 14 Mar 2019 02:18:07 -0500 (CDT) Received: from mail-io1-f71.google.com (mail-io1-f71.google.com [209.85.166.71]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 6CEE6C84 for ; Thu, 14 Mar 2019 02:18:07 -0500 (CDT) Received: by mail-io1-f71.google.com with SMTP id k24so3579101ioa.18 for ; Thu, 14 Mar 2019 00:18:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=oRmn4b9rhT3KDTlseWZhI2IzGPx/P3+INt92Eg01Y0c=; b=M1yj+fuo0rJqX3b9OyOKqI5LU5WCUiUzwlNCH13DL5l5yOWqW08Z1y7XGxYOyPuSjX FSHmf6KBzB3G0ki1tEhmNIwbeTOfFEuLTyS4YYwt9n4WthUJk7UmAvNUY8A0CBoNseFz cfcybQXbmmwLZmDIv30JD9ZpGDPAxdkvtZXCgql4V15dF0oqVX4PJwwd78eVvepCB95n 3L+uMR+hzQQRPKLCbWvUpW+ZiBn/Jyl1J76WtmTA0JQRJI1hbQDTK7Kmtad2aD800y7U f3hKgib6F3S+mC3O63ARoSkWfDg6VBOy3/+z3ESHG0pcyAYFQqcUa4BAasSGHtE2kwgC z7Ag== 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; bh=oRmn4b9rhT3KDTlseWZhI2IzGPx/P3+INt92Eg01Y0c=; b=qZAzSq6OKngWlORH1bs4CknU6UQUgBP4+6t9QjrjoVeWsFKD2syi1J02JSJQXBAmd1 CVNLSn8aLyD7OfPZTZtWdmBnpg7Izo4Qlg7iF3WJV+q3KWfgx802l55GNDDPzzX+GuKN 01H6MsOdMOdy2v9bLJUcb8uHWMkMLGoTQsPcjWTdR+FaKI/Yutb1aexdQB/iztfh1y7h f6gnk4xIMYqKnGKTjVRoOyAZLBaD7XCMfcxQrPbZ/2E6PfZWD0xNh90B7LAoaRrUVgdi N9IkrzUteHYTV/APaLIsZKXE/wE8g62FSYg4ODdYExqz8fgLBUt+JNWyPydBYWRKSbd2 Pk1w== X-Gm-Message-State: APjAAAUZzjqCEtifav9UXYbw9+JY5ZaKLQlV7TThZ0XRWKLBXL22Xz/N hFWQUyc1lLrtbU0gRTjlQqv8h8MyZOJixRVHI2qWDll/h4uN8akwgufJeKn7utQESEG0Akd5Ev5 L7c7nIJrF2weC1a09M2jmNSpV9Htj X-Received: by 2002:a24:d51:: with SMTP id 78mr1001978itx.133.1552547886931; Thu, 14 Mar 2019 00:18:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqx3tadtwe+bSiINjlA7kUxPih+uN+gRSEnEL+OTIJYnGmVIF8fK5+kfFSuBsJnCuv9SMvTQtg== X-Received: by 2002:a24:d51:: with SMTP id 78mr1001966itx.133.1552547886663; Thu, 14 Mar 2019 00:18:06 -0700 (PDT) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id z10sm6112974iol.25.2019.03.14.00.18.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2019 00:18:05 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, Richard Genoud , Greg Kroah-Hartman , Jiri Slaby , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches , linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] tty: atmel_serial: fix a NULL pointer dereference Date: Thu, 14 Mar 2019 02:17:59 -0500 Message-Id: <20190314071759.18845-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In case dmaengine_prep_dma_cyclic fails, the fix return a proper error code to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu --- drivers/tty/serial/atmel_serial.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 05147fe24343..cf560d05008c 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -1237,8 +1237,10 @@ static int atmel_prepare_rx_dma(struct uart_port *port) dma_cap_set(DMA_CYCLIC, mask); atmel_port->chan_rx = dma_request_slave_channel(mfd_dev, "rx"); - if (atmel_port->chan_rx == NULL) + if (atmel_port->chan_rx == NULL) { + ret = -EINVAL; goto chan_err; + } dev_info(port->dev, "using %s for rx DMA transfers\n", dma_chan_name(atmel_port->chan_rx)); @@ -1257,6 +1259,7 @@ static int atmel_prepare_rx_dma(struct uart_port *port) if (!nent) { dev_dbg(port->dev, "need to release resource of dma\n"); + ret = -EINVAL; goto chan_err; } else { dev_dbg(port->dev, "%s: mapped %d@%p to %pad\n", __func__, @@ -1288,6 +1291,11 @@ static int atmel_prepare_rx_dma(struct uart_port *port) sg_dma_len(&atmel_port->sg_rx)/2, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT); + if (!desc) { + dev_err(port->dev, "Preparing DMA cyclic failed\n"); + ret = -ENOMEM; + goto chan_err; + } desc->callback = atmel_complete_rx_dma; desc->callback_param = port; atmel_port->desc_rx = desc; @@ -1300,7 +1308,7 @@ static int atmel_prepare_rx_dma(struct uart_port *port) atmel_port->use_dma_rx = 0; if (atmel_port->chan_rx) atmel_release_rx_dma(port); - return -EINVAL; + return ret; } static void atmel_uart_timer_callback(struct timer_list *t) -- 2.17.1 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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 996DCC43381 for ; Thu, 14 Mar 2019 07:18:26 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 644D22184C for ; Thu, 14 Mar 2019 07:18:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="c9RWYKWm"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="M1yj+fuo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 644D22184C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=umn.edu Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=/PFjQEYIPVkKre8pUaPPZ3ldBEMxIsZgI0bVxYE+86E=; b=c9R WYKWm/F3+anyE3sznRGUOf5ik1khQEHRqdjjwf+P1OEawUyn3K75Zjhn1RMCgd05kgoJDWwTyS+nL uJKt0s40ZUOiWzL6pSMqBwrFoHISHQgDs6GY23O0hHfa49JdsLJjCtqRGBbx1gAt9lWqrp1NTiqIz cbyGu8vJn67AvCLFwSCnXpRQxeXSxlc5RZ5ZdRerAbqOTxFL/JdgnL8Xcicb0Dt+JIjjLReZHtVmE ou0pWqjpyEsSR33WgniTOteM6ENhkDymc9aulusU9p+/9jDN4cQub68peNpe/Je/28A6Yrk71lDww x46Gcg9xnObrYkxuaL0g0G46Y8lvrXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h4Kd9-0007xa-DT; Thu, 14 Mar 2019 07:18:19 +0000 Received: from mta-p6.oit.umn.edu ([134.84.196.206]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h4Kd4-0007wh-W4 for linux-arm-kernel@lists.infradead.org; Thu, 14 Mar 2019 07:18:16 +0000 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 84212BA9 for ; Thu, 14 Mar 2019 07:18:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PGQwqgNaGadt for ; Thu, 14 Mar 2019 02:18:07 -0500 (CDT) Received: from mail-it1-f199.google.com (mail-it1-f199.google.com [209.85.166.199]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 51862BAC for ; Thu, 14 Mar 2019 02:18:07 -0500 (CDT) Received: by mail-it1-f199.google.com with SMTP id q141so3901811itc.2 for ; Thu, 14 Mar 2019 00:18:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=oRmn4b9rhT3KDTlseWZhI2IzGPx/P3+INt92Eg01Y0c=; b=M1yj+fuo0rJqX3b9OyOKqI5LU5WCUiUzwlNCH13DL5l5yOWqW08Z1y7XGxYOyPuSjX FSHmf6KBzB3G0ki1tEhmNIwbeTOfFEuLTyS4YYwt9n4WthUJk7UmAvNUY8A0CBoNseFz cfcybQXbmmwLZmDIv30JD9ZpGDPAxdkvtZXCgql4V15dF0oqVX4PJwwd78eVvepCB95n 3L+uMR+hzQQRPKLCbWvUpW+ZiBn/Jyl1J76WtmTA0JQRJI1hbQDTK7Kmtad2aD800y7U f3hKgib6F3S+mC3O63ARoSkWfDg6VBOy3/+z3ESHG0pcyAYFQqcUa4BAasSGHtE2kwgC z7Ag== 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; bh=oRmn4b9rhT3KDTlseWZhI2IzGPx/P3+INt92Eg01Y0c=; b=ijx5uFPMJAvHdG4TMHYWFXIQ3PN6JM/rSO2nDLPCSO02qwkzBUqrjpm2j7089zk+eL NH+xWqNytaTzRk7hpznY2Xe47xSfCXJiJZosHhHrGtr3N5LFtZzYB1iEV2hbr3xnVmCd nuKCtkYwhlsgqQ8PVEriEz4lhSjbQHuMN2yV7hHqOigpQCf17+0XCCb8bJ2RAgeXtHQ8 pQNN8cOcHvbGBUlRM1sh9MjQ1gtib1oKgZOpC+sujvROvQJ1rT+puHKo8MlYWuNuH+5k D74SXYUZyJA1WWI9vGMpxCZGiyvZjPgv7KjJs1XP0mPQ9kkITybTrSkYjTbGhrbFKgEb poJw== X-Gm-Message-State: APjAAAVhjRndiVkBBjfXbZLCQVrEeJpWpXl0eU8NMX7RY1x/vXcdxdLk pkardeUmuohfJlOsbgSQy0Fer97HOWsAL+t4E3YW6kp0hnYNWWNPWy7ydfd2oP58KcFSw/qdZaA k6vv0rQzj5lR/cBL9AbNkZ56RlPZXqjxDEPwR3+o= X-Received: by 2002:a24:d51:: with SMTP id 78mr1001983itx.133.1552547886937; Thu, 14 Mar 2019 00:18:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqx3tadtwe+bSiINjlA7kUxPih+uN+gRSEnEL+OTIJYnGmVIF8fK5+kfFSuBsJnCuv9SMvTQtg== X-Received: by 2002:a24:d51:: with SMTP id 78mr1001966itx.133.1552547886663; Thu, 14 Mar 2019 00:18:06 -0700 (PDT) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id z10sm6112974iol.25.2019.03.14.00.18.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2019 00:18:05 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Subject: [PATCH] tty: atmel_serial: fix a NULL pointer dereference Date: Thu, 14 Mar 2019 02:17:59 -0500 Message-Id: <20190314071759.18845-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190314_001815_119912_4C56046A X-CRM114-Status: GOOD ( 14.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Richard Genoud , Greg Kroah-Hartman , pakki001@umn.edu, linux-kernel@vger.kernel.org, Ludovic Desroches , linux-serial@vger.kernel.org, Jiri Slaby , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org In case dmaengine_prep_dma_cyclic fails, the fix return a proper error code to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu --- drivers/tty/serial/atmel_serial.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 05147fe24343..cf560d05008c 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -1237,8 +1237,10 @@ static int atmel_prepare_rx_dma(struct uart_port *port) dma_cap_set(DMA_CYCLIC, mask); atmel_port->chan_rx = dma_request_slave_channel(mfd_dev, "rx"); - if (atmel_port->chan_rx == NULL) + if (atmel_port->chan_rx == NULL) { + ret = -EINVAL; goto chan_err; + } dev_info(port->dev, "using %s for rx DMA transfers\n", dma_chan_name(atmel_port->chan_rx)); @@ -1257,6 +1259,7 @@ static int atmel_prepare_rx_dma(struct uart_port *port) if (!nent) { dev_dbg(port->dev, "need to release resource of dma\n"); + ret = -EINVAL; goto chan_err; } else { dev_dbg(port->dev, "%s: mapped %d@%p to %pad\n", __func__, @@ -1288,6 +1291,11 @@ static int atmel_prepare_rx_dma(struct uart_port *port) sg_dma_len(&atmel_port->sg_rx)/2, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT); + if (!desc) { + dev_err(port->dev, "Preparing DMA cyclic failed\n"); + ret = -ENOMEM; + goto chan_err; + } desc->callback = atmel_complete_rx_dma; desc->callback_param = port; atmel_port->desc_rx = desc; @@ -1300,7 +1308,7 @@ static int atmel_prepare_rx_dma(struct uart_port *port) atmel_port->use_dma_rx = 0; if (atmel_port->chan_rx) atmel_release_rx_dma(port); - return -EINVAL; + return ret; } static void atmel_uart_timer_callback(struct timer_list *t) -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel