Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1491160ybh; Thu, 23 Jul 2020 10:07:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSqjVAEfTRBhsFSofFYyM0eT1A60UPyQ6FjsxiXcidMB4DIxEVGBAF8eIxrklL+DjkrEga X-Received: by 2002:a17:906:36da:: with SMTP id b26mr5255664ejc.45.1595524077337; Thu, 23 Jul 2020 10:07:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595524077; cv=none; d=google.com; s=arc-20160816; b=npXX+YheLEqexlxgQGxvtKFIvqRQpTPyp+OumhtnfgOlDRFpWbkhpCCNgPKJQmSHmx x2D27HKQ7YNC+PKTzWH1UrEq92A4DtHxdjSMBC4jQn74kNzh4Tl40wY0lSQY3RzqbA8W 8kdlblfeEsGfg7X4zYbDkkTKxnkbrOg3VaYNR9rqfskLg5A+5yM4F5t598C8mr65rRpk 9p0rjqaYXODGU2RUKT8/jWUvjRrOctbcuxTB57Db970+iKPgaEu2iFzUVYO8McixM9gi OxM8+dsgF1Hrb6nIT6X/NN+GOyP2hvMN8rU9awByhSCqMQwCDA3erlcPxCPZkULL6rRs ICUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=5XElznoJzTIgZnbVUdTBgMgTEdJlRyrMaO48CA5TXM0=; b=GgSWxyZI8j4IY9ttSYBpp3r1vUTsVch16Uc02NoiN/cvCiqo9rXGXWU6O1aaTK/qxk 4k+bWjxB+fRXtlK/9JL9p65IwQfb3YL8qHmaU5DoTDfWg6JQu3rb16fvzMBsR8ptrFFG 09e+7vo1W92TwCRUuqCW9zxjGc2iBSW9UMNMCe7o63rmVuHhxy2X/phwudCYv14Mq8f4 gP8mSQS2U66igTVAI+/AenCOho4rTLedS/3g/k2pR7IYGGbfmowf7FCbDmGpxmbth2Rq DNzcWAFINZgq9DHHCfQOA43kBcNINX4F0K9iSAKC7jN6+gah7kjVf6uFLP15qK+9Fw6y P+KA== ARC-Authentication-Results: i=1; mx.google.com; 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=ispras.ru Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f20si2743763edc.396.2020.07.23.10.07.34; Thu, 23 Jul 2020 10:07:57 -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; 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=ispras.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728030AbgGWRE7 (ORCPT + 99 others); Thu, 23 Jul 2020 13:04:59 -0400 Received: from mail.ispras.ru ([83.149.199.84]:36826 "EHLO mail.ispras.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726254AbgGWRE6 (ORCPT ); Thu, 23 Jul 2020 13:04:58 -0400 Received: from hellwig.intra.ispras.ru (unknown [10.10.2.182]) by mail.ispras.ru (Postfix) with ESMTPS id 3F98C40A2040; Thu, 23 Jul 2020 17:04:56 +0000 (UTC) From: Evgeny Novikov To: "Lad, Prabhakar" Cc: Evgeny Novikov , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org Subject: [PATCH] media: davinci: vpif_capture: fix potential double free Date: Thu, 23 Jul 2020 20:04:53 +0300 Message-Id: <20200723170453.432-1-novikov@ispras.ru> X-Mailer: git-send-email 2.16.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 d9ec439faefa..72a0e94e2e21 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -1482,8 +1482,6 @@ static int vpif_probe_complete(void) /* Unregister video device */ video_unregister_device(&ch->video_dev); } - kfree(vpif_obj.sd); - v4l2_device_unregister(&vpif_obj.v4l2_dev); return err; } -- 2.16.4