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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 2BC5DC43603 for ; Wed, 4 Dec 2019 18:14:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 01F2B20675 for ; Wed, 4 Dec 2019 18:14:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483257; bh=bhPbd1Q7AtDDpN7vSxVvjBu3+BIHBLCpWA1+mEKnBJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gjEGTphOPbu1P1HpC1sX+vpbMgRrOW/qKZpChEvb03tmQlhhe0dwUSEVyP3PqQ8Wy 31SVwHl701v8xuLL/sxkW8qG814VVhWvZ4IuGjAwc0NyADhnFHFxnYQfy40NVGIirb kOI09vjI6gwSg9K7z3p8v45Y+mj7rpMBstB+bgBM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731408AbfLDSOM (ORCPT ); Wed, 4 Dec 2019 13:14:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:43506 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731879AbfLDSOL (ORCPT ); Wed, 4 Dec 2019 13:14:11 -0500 Received: from localhost (unknown [217.68.49.72]) (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 B767D20865; Wed, 4 Dec 2019 18:14:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483251; bh=bhPbd1Q7AtDDpN7vSxVvjBu3+BIHBLCpWA1+mEKnBJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U9QyLq0Fnl3RIaEkZ17Us3Cb8Skfr8nOJO7HxHKt+RuzWUZKxiS77erKPMCiudp25 tocAtS9ZrUxE3L57LR0K0RE+Ep70f3dwkV0olSDHMlQnUVq2zs6rW4yratfEzrhAkL A1yhEDXbd1WZv6TkwP6typUf3/fOZQyUH6B/+cZw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eugen Hristev , Hans Verkuil , Mauro Carvalho Chehab , Lee Jones Subject: [PATCH 4.9 113/125] media: atmel: atmel-isc: fix asd memory allocation Date: Wed, 4 Dec 2019 18:56:58 +0100 Message-Id: <20191204175325.992756023@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175308.377746305@linuxfoundation.org> References: <20191204175308.377746305@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eugen Hristev commit 1e4e25c4959c10728fbfcc6a286f9503d32dfe02 upstream. The subsystem will free the asd memory on notifier cleanup, if the asd is added to the notifier. However the memory is freed using kfree. Thus, we cannot allocate the asd using devm_* This can lead to crashes and problems. To test this issue, just return an error at probe, but cleanup the notifier beforehand. Fixes: 106267444f ("[media] atmel-isc: add the Image Sensor Controller code") Signed-off-by: Eugen Hristev Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Lee Jones Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/atmel/atmel-isc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/drivers/media/platform/atmel/atmel-isc.c +++ b/drivers/media/platform/atmel/atmel-isc.c @@ -1297,8 +1297,11 @@ static int isc_parse_dt(struct device *d break; } - subdev_entity->asd = devm_kzalloc(dev, - sizeof(*subdev_entity->asd), GFP_KERNEL); + /* asd will be freed by the subsystem once it's added to the + * notifier list + */ + subdev_entity->asd = kzalloc(sizeof(*subdev_entity->asd), + GFP_KERNEL); if (subdev_entity->asd == NULL) { of_node_put(rem); ret = -ENOMEM; @@ -1432,6 +1435,7 @@ static int atmel_isc_probe(struct platfo &subdev_entity->notifier); if (ret) { dev_err(dev, "fail to register async notifier\n"); + kfree(subdev_entity->asd); goto cleanup_subdev; }