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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,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 0B195C433E7 for ; Tue, 1 Sep 2020 17:03:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C93F8206FA for ; Tue, 1 Sep 2020 17:03:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598979818; bh=g9YrcRqLeklmgjCLiUIL82XQQAHuZdvNqGYie5hMeXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ES+TlVoGCgIQMgM4aMuEJr5yhQQmTAyHp0IFqY2re+wVC+4Xi6INQaHqwF/OqU2C/ CEhrmHYCy57ngR0fwGfTaQYyXnZqRPVQX4om5ghXElzN+FFfoXeOXhGDOGTdPyx7Fg x1omtNARQQJ9erxcezZ9AUfFICXkH/x1aqDBMgNQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728204AbgIARDe (ORCPT ); Tue, 1 Sep 2020 13:03:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:39798 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729587AbgIAPUH (ORCPT ); Tue, 1 Sep 2020 11:20: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 A72DA206EB; Tue, 1 Sep 2020 15:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598973607; bh=g9YrcRqLeklmgjCLiUIL82XQQAHuZdvNqGYie5hMeXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rsK0wZyVSL0BYszojPcLJWMpAm5hwNxYSkzAZrIaztDcLU6Q1Uqkli8YB9z/jcaIm TzMY5WP0i9ISI0EDZPaNRXv5RPLklQDF6YAx2kgJTliT2skY/gbB4kejyG0a9hpwUQ wuZcpnxVMPEcMgH56AtXvFH3V60Y5YyZAcMs+FmE= 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.14 36/91] media: davinci: vpif_capture: fix potential double free Date: Tue, 1 Sep 2020 17:10:10 +0200 Message-Id: <20200901150929.932971529@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200901150928.096174795@linuxfoundation.org> References: <20200901150928.096174795@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 dc8fc2120b63f..acc52d28c5c45 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