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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable 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 2360EC3F2D1 for ; Wed, 4 Mar 2020 08:40:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F08C1206D5 for ; Wed, 4 Mar 2020 08:40:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="qEwXCsIR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387661AbgCDIkH (ORCPT ); Wed, 4 Mar 2020 03:40:07 -0500 Received: from lelv0142.ext.ti.com ([198.47.23.249]:54714 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387396AbgCDIkG (ORCPT ); Wed, 4 Mar 2020 03:40:06 -0500 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 0248e52t078499; Wed, 4 Mar 2020 02:40:06 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1583311206; bh=Nor6UwICB71c/cHX1FmjRqlYHp+LS5fnin9yQh6uyuY=; h=Subject:To:CC:References:From:Date:In-Reply-To; b=qEwXCsIRoB9KIBCIJRCBpDuRDH9Pez31eTXr8hdfpz3swDjdQLKEoKSai9UirTlMK ZYC0aBmA+ayMNoMrf4/xn3H2siDz5f1lsLuXXF24+sOcc5I3vzEIkL78l6oCvPw9Ql +sBdABj3x0gB38+mAcDd/RRbcEoFaY0jKWXoh8Vg= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 0248e5ks078118 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 4 Mar 2020 02:40:05 -0600 Received: from DLEE108.ent.ti.com (157.170.170.38) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3; Wed, 4 Mar 2020 02:40:05 -0600 Received: from localhost.localdomain (10.64.41.19) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3 via Frontend Transport; Wed, 4 Mar 2020 02:40:05 -0600 Received: from [192.168.2.6] (ileax41-snat.itg.ti.com [10.172.224.153]) by localhost.localdomain (8.15.2/8.15.2) with ESMTP id 0248e3F9058305; Wed, 4 Mar 2020 02:40:04 -0600 Subject: Re: [Patch] media: ti-vpe: cal: fix a kernel oops when unloading module To: Benoit Parrot , Hans Verkuil CC: , , , References: <20200303172629.21339-1-bparrot@ti.com> From: Tomi Valkeinen Message-ID: <4010c13f-6a32-f3c3-5b6d-62a4e3782c64@ti.com> Date: Wed, 4 Mar 2020 10:40:03 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <20200303172629.21339-1-bparrot@ti.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/03/2020 19:26, Benoit Parrot wrote: > After the switch to use v4l2_async_notifier_add_subdev() and > v4l2_async_notifier_cleanup(), unloading the ti_cal module would casue a > kernel oops. > > This was root cause to the fact that v4l2_async_notifier_cleanup() tries > to kfree the asd pointer passed into v4l2_async_notifier_add_subdev(). > > In our case the asd reference was from a statically allocated struct. > So in effect v4l2_async_notifier_cleanup() was trying to free a pointer > that was not kalloc. > > So here we switch to using a kzalloc struct instead of a static one. > > Fixes: d079f94c9046 ("media: platform: Switch to v4l2_async_notifier_add_subdev") > > Cc: stable@vger.kernel.org > Signed-off-by: Benoit Parrot > --- > drivers/media/platform/ti-vpe/cal.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c > index 6d4cbb8782ed..18fe2cb9dd17 100644 > --- a/drivers/media/platform/ti-vpe/cal.c > +++ b/drivers/media/platform/ti-vpe/cal.c > @@ -372,8 +372,6 @@ struct cal_ctx { > struct v4l2_subdev *sensor; > struct v4l2_fwnode_endpoint endpoint; > > - struct v4l2_async_subdev asd; > - > struct v4l2_fh fh; > struct cal_dev *dev; > struct cc_data *cc; > @@ -2032,7 +2030,6 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst) > > parent = pdev->dev.of_node; > > - asd = &ctx->asd; > endpoint = &ctx->endpoint; > > ep_node = NULL; > @@ -2040,6 +2037,10 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst) > sensor_node = NULL; > ret = -EINVAL; > > + asd = kzalloc(sizeof(*asd), GFP_KERNEL); > + if (!asd) > + goto cleanup_exit; > + > ctx_dbg(3, ctx, "Scanning Port node for csi2 port: %d\n", inst); > for (index = 0; index < CAL_NUM_CSI2_PORTS; index++) { > port = of_get_next_port(parent, port); > Thanks, this fixes the crash for me. It does look a bit odd that something is allocated with kzalloc, and then it's freed somewhere inside v4l2_async_notifier_cleanup, though. But if that's how it supposed to be used, looks fine to me. Reviewed-by: Tomi Valkeinen Tomi -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki