Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1816302pxk; Tue, 1 Sep 2020 08:27:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBK7UF5Qg5sF8MMqfjfnBMcLfL4CJDmwNglG8+siZbGf1fakiwUPGub3KfMFbKBzDmYD4z X-Received: by 2002:a17:906:5490:: with SMTP id r16mr1855809ejo.222.1598974047196; Tue, 01 Sep 2020 08:27:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598974047; cv=none; d=google.com; s=arc-20160816; b=nkUU1YMhXPwqGzRCexPw9ji7rNMxH1Senf6CUIoOhA/zQFvAeYUAQEQnI4H7oBQ3zz s+CzF0VZnngy8SFyUceb5jdGWYyYgv26iG+IIPJFFiT7gQvsVHU3nYfE5Sh6C6bdrBt4 +lUjIvzvJap4FsfBMsQRRy7Gx4BYrkPoWwvjXiCak/eM+T58RkpOi72fQerJLecHMTa6 ZcphhDFIWpZ8y0tLwwJxCnt+JSVWOKbDncXxjKDooPPZ0y/jLM1nhP1h6gWv6ww0MexA R07+xK2z/hm2R5qVPO9ZaO9mQ/qdm7x0C4R1xqYdpMrgISzqwQfAoQk61QudLjYjFSuB QZ+Q== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KM8kydDfhaJL0i5rCiSw1yQh2u41zNpt6HXqEuktoLE=; b=C23g86LCDObMWBbxsPrF1xc+iQHoT7Ry3OAWjWIIhmIhPCWV3lK4HghakSFLf3V6f3 Hm6blTsDLZqapddyt2Rvq142NLWwlEJeXVatBszjm9SCmrHTXVIv/oXRPgoMnddRQXXz Ely8L01748QaUMiIsiHAvnwV0H7nwPFmMOslV5w17g9SJ9GZSZ+kTY7dm790mSx4eIiv mkMKAOrswxNzhr2SpmQISZC0+rb65DE9rBNNyWhFROempDsAehc6NoRhz6Q7KQEUZQxG d+QF1h1GZGQ4Wc1CUq3qg/pBHtRZiGHGfFoYYTw2E/duU7kgtLz+h9X3HMNmrqgqlZhR meOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uOleXKj9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 4si735112edw.95.2020.09.01.08.27.04; Tue, 01 Sep 2020 08:27:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=uOleXKj9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730106AbgIAP00 (ORCPT + 99 others); Tue, 1 Sep 2020 11:26:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:45864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729780AbgIAPXH (ORCPT ); Tue, 1 Sep 2020 11:23:07 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 00071206FA; Tue, 1 Sep 2020 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598973787; bh=Ttkps5pps/+L2vqi5gedAmzC0sp9bGqD8MQBJGpJzGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uOleXKj9lXioQoi0Wr8VAJon0yczXVLPmVcBZBqHTByrxTO5VLUNYN4ZU6ewZdHp4 DZHBSOXn6yrhUyDOcisZ7jTNUxQc9rFZaPha9sBQsVzbiuyrmq5lhrVZM/2rDDtoyY zKF13A/jN3gj49cOyvZqDpQmXLXru/EvhBAxqjKI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Evgeny Novikov , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 047/125] media: davinci: vpif_capture: fix potential double free Date: Tue, 1 Sep 2020 17:10:02 +0200 Message-Id: <20200901150936.857115610@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200901150934.576210879@linuxfoundation.org> References: <20200901150934.576210879@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: Evgeny Novikov [ Upstream commit 602649eadaa0c977e362e641f51ec306bc1d365d ] In case of errors vpif_probe_complete() releases memory for vpif_obj.sd and unregisters the V4L2 device. But then this is done again by vpif_probe() itself. The patch removes the cleaning from vpif_probe_complete(). Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Evgeny Novikov Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/davinci/vpif_capture.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index a96f53ce80886..cf1d11e6dd8c4 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -1489,8 +1489,6 @@ probe_out: /* Unregister video device */ video_unregister_device(&ch->video_dev); } - kfree(vpif_obj.sd); - v4l2_device_unregister(&vpif_obj.v4l2_dev); return err; } -- 2.25.1