Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8332112ybl; Thu, 16 Jan 2020 14:47:59 -0800 (PST) X-Google-Smtp-Source: APXvYqx61BVyD/UG7SnkETbv0/Xwuc5c6CHJXzPAyEQa+lSjOZuriml1eeEHk7Nke0W5TZAQzdPm X-Received: by 2002:a9d:6c01:: with SMTP id f1mr3826879otq.133.1579214879256; Thu, 16 Jan 2020 14:47:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579214879; cv=none; d=google.com; s=arc-20160816; b=FBtimD7rdQDWJM/Egz0HqQQKqKfmoTydHIyLxQqzTCV34haJzdmBvrzBu2MPEEf8GZ jaG5vzVYHDbrxCSn0X0NCUfyIOM1BGxOTXleQBoABozEIzOHGT0EKqKuMgbwX9zomhC2 5rU5iJxkjOchLmLmQl4MIDmqXmZfwhbjryxH0V+1RJ+XWIem620QKfRMxQECOYz8gRVs DgHjyNLg1Fe5QXv0ur/N1UyuBYKyEI2D+KII+CKPCv3ttZB4IVP45whHcWqMLF1r5CSC ylYiabZyGgytNDO9cpf0+/IgEfW4k3z/pWlIbePW8VpFTNr+hiuxVEzuDyBiGbCaZmxW 1vEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=W270P0rh6FyRszK7pNYPVcMAw9SA7iJYoc/uQWywLoo=; b=r50e/gNaP8yK2ivykUQ/DcJajY4KFZgpEI/TFX1cJCNlr7HNnPlam/4b8jj/3yr/9g HbK/qtq4iREIQ3Y1dB2R4mhasp5eE/iWDK1mPWguwEgwjQA+SCtVb3W2wwlL4fmi35Z2 hvYj8FE35Kvp5qIx6kq6QvSoxNmagU76W/4wh3y0QuKH2yiShJYRhG1nfP8MDbuk+BRC KMDOKE3gHEP5VVhOHwfg3xSLKE6FmZQR5JBLwZ7ZQqokP3YG4Sq8EZZi2zem7cS+R1dw HM2KxtBnkdyQiIvmibyQXOFGW7u7Ge3/8zRC/v5ocl9x3QAID9c946LKGsKzkkdSqM3s W+YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gIGWLsEb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j16si12000219oii.57.2020.01.16.14.47.47; Thu, 16 Jan 2020 14:47:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gIGWLsEb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395082AbgAPSJm (ORCPT + 99 others); Thu, 16 Jan 2020 13:09:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:53958 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393295AbgAPRiM (ORCPT ); Thu, 16 Jan 2020 12:38:12 -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 18542246D6; Thu, 16 Jan 2020 17:38:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196291; bh=PydPYIzYqd2xMae7JH6yTW0jxoVCJa+t/kLy24YHEwU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gIGWLsEbka3/WN7CubisCHLawGMUuGzdTNfxteIvr+XCCyagmtNNw4AF8IPGNCb6b wWKnSumzHTnPWL6dNAAMGfOLDTGTesJDYED8AGO16LEhMZli7ibM0/V8ojX83yCF+Y Nxy52WeWimqpMafk5fvha6iSP59RWJpoGNRIuyts= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: YueHaibing , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 106/251] media: tw5864: Fix possible NULL pointer dereference in tw5864_handle_frame Date: Thu, 16 Jan 2020 12:34:15 -0500 Message-Id: <20200116173641.22137-66-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 1ddf80f85c24..27ff6e0d9845 100644 --- a/drivers/media/pci/tw5864/tw5864-video.c +++ b/drivers/media/pci/tw5864/tw5864-video.c @@ -1386,13 +1386,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