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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 B3CAEC2D0DB for ; Fri, 24 Jan 2020 11:15:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CA4120704 for ; Fri, 24 Jan 2020 11:15:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864545; bh=tUh6CLf0IpiGLRBcHFAphW+usAQVEqq6YxT2MviT4vw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LoPsG7co9CTQqRK7DkQosxt3RKmzOOaisBW8HkMANjvO40/L7AsJ73QtF0tb5ZTRB IuxY4NgRGLlbB9n7vO3J5pL4S9aLO3Bl6FKupXtzGB5S8db3epyenibq0BOFzDzL4Q EDwDWncDHLysu6k/O9uaIBFrasVF/fxaOswkPKFI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390174AbgAXLPn (ORCPT ); Fri, 24 Jan 2020 06:15:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:52286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390305AbgAXLPk (ORCPT ); Fri, 24 Jan 2020 06:15:40 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 7586520708; Fri, 24 Jan 2020 11:15:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864540; bh=tUh6CLf0IpiGLRBcHFAphW+usAQVEqq6YxT2MviT4vw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FRVI9Gv8b7Aev3xPT5LSCo9JptQQZfdjxsfPS7IcYU5Aas31b1mbiyCy2syfK7cVf M+7GyqUnR7GOvAP7ssBIIZblEki7xs1eIcuIeDul6yN/bIkyLjDphWZJYbF/mi2b0r grdvbwa8sVCbDQhGmc6yWqCbxihLHyBdex5z8c4k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 281/639] media: tw5864: Fix possible NULL pointer dereference in tw5864_handle_frame Date: Fri, 24 Jan 2020 10:27:31 +0100 Message-Id: <20200124093122.017268600@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: YueHaibing [ Upstream commit 2e7682ebfc750177a4944eeb56e97a3f05734528 ] 'vb' null check should be done before dereferencing it in tw5864_handle_frame, otherwise a NULL pointer dereference may occur. Fixes: 34d1324edd31 ("[media] pci: Add tw5864 driver") Signed-off-by: YueHaibing Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/pci/tw5864/tw5864-video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/tw5864/tw5864-video.c b/drivers/media/pci/tw5864/tw5864-video.c index ff2b7da90c088..6c40e60ac9939 100644 --- a/drivers/media/pci/tw5864/tw5864-video.c +++ b/drivers/media/pci/tw5864/tw5864-video.c @@ -1395,13 +1395,13 @@ static void tw5864_handle_frame(struct tw5864_h264_frame *frame) input->vb = NULL; spin_unlock_irqrestore(&input->slock, flags); - v4l2_buf = to_vb2_v4l2_buffer(&vb->vb.vb2_buf); - if (!vb) { /* Gone because of disabling */ dev_dbg(&dev->pci->dev, "vb is empty, dropping frame\n"); return; } + v4l2_buf = to_vb2_v4l2_buffer(&vb->vb.vb2_buf); + /* * Check for space. * Mind the overhead of startcode emulation prevention. -- 2.20.1