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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 A5AF8C43381 for ; Mon, 1 Apr 2019 17:49:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 637B020830 for ; Mon, 1 Apr 2019 17:49:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554140994; bh=1Ggic0OxhynrH99m7mIHi8evBe/s8T5N+THJ95yNzII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ox1jq9vS6pW4X/mFEOTln7jx6kckKThODj0v1mESB0Gvg9ov2Jc+G24TtbhJ1xRWv VuWYmOtPS6YD3bX5I3NGavq8C0eoqBoYdZ6AhrmmCbl6eTLdcxMD6ANIw3jrFwQ77X AWlnzIIH5FrB9ZwG+zA61VFKpe1/XgWBUSEviLRQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732246AbfDAR32 (ORCPT ); Mon, 1 Apr 2019 13:29:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:35776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732938AbfDAR3Z (ORCPT ); Mon, 1 Apr 2019 13:29:25 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CD5AF20856; Mon, 1 Apr 2019 17:29:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554139765; bh=1Ggic0OxhynrH99m7mIHi8evBe/s8T5N+THJ95yNzII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ynNWebnJYzPHC5uZraVzQbIzd7HDehGQIMs86bzexBxAlkaOp2EvQU6Pb6MTwlCB3 yq6pkVPqg/8JPZe/CAHKRSNBfN455UNGKEjnJIeP1UoukmkWCXDM1We/wWLNvWJao/ m7RrwHK+b8w1GTPfn6me3Es7OeFzo+dwiyqrBHUc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , Richard Genoud Subject: [PATCH 4.9 32/56] tty: atmel_serial: fix a potential NULL pointer dereference Date: Mon, 1 Apr 2019 19:02:48 +0200 Message-Id: <20190401170105.691117725@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170103.398401360@linuxfoundation.org> References: <20190401170103.398401360@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kangjie Lu commit c85be041065c0be8bc48eda4c45e0319caf1d0e5 upstream. In case dmaengine_prep_dma_cyclic fails, the fix returns a proper error code to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu Fixes: 34df42f59a60 ("serial: at91: add rx dma support") Acked-by: Richard Genoud Cc: stable Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/atmel_serial.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -1166,6 +1166,10 @@ static int atmel_prepare_rx_dma(struct u 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"); + goto chan_err; + } desc->callback = atmel_complete_rx_dma; desc->callback_param = port; atmel_port->desc_rx = desc;