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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2F67C4167B for ; Mon, 4 Dec 2023 13:56:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344870AbjLDN4C (ORCPT ); Mon, 4 Dec 2023 08:56:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344854AbjLDNzv (ORCPT ); Mon, 4 Dec 2023 08:55:51 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC7F690; Mon, 4 Dec 2023 05:55:57 -0800 (PST) Received: from nicolas-tpx395.localdomain (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: nicolas) by madras.collabora.co.uk (Postfix) with ESMTPSA id 777066607090; Mon, 4 Dec 2023 13:55:55 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701698156; bh=wD2ubbvS7eFYc7JS8cp6iuoHY5//3jKYOuC554SErTw=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=Ih34D7OwsXYpv77xCCo/dPALgCqYbEPj+mvJ/SdCmiumsp/i5nb9igiwVegqZ0xum 2GdCaNWzog/m9VJ/zN+fJeQWMUz7eJXkgRHxcdDZQvKOgvlnLCHujRQJTco5BRGKma i2gHd0Fws8FMh6FPqJ1yR6LWqQGCzOZwuseF5uQBhiM0RTQCbLAtxx7hx038qFyfXn KF0ip8xvG44l9c2yfimihZXy6oL6p19rDtBNlO5jqIHZZYqrs30yWInqhAFCidRMBM ZKDRpqViPpkzDNOnCuJfJihHclTzCYyt0UhXAsHH57EGtKD57kYc93cp2Nx+w7JzLC kT7/2wOxIWr1g== Message-ID: Subject: Re: [PATCH] Fix memory leaks in wave5_vpu_open_enc() and wave5_vpu_open_dec() From: Nicolas Dufresne To: Zeng Chi , nas.chung@chipsnmedia.com, jackson.lee@chipsnmedia.com, mchehab@kernel.org, sebastian.fricke@collabora.com, hverkuil-cisco@xs4all.nl, bob.beckett@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 04 Dec 2023 08:55:46 -0500 In-Reply-To: <20231204091649.3418987-1-zengchi@kylinos.cn> References: <20231204091649.3418987-1-zengchi@kylinos.cn> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 (3.48.4-1.fc38) MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Le lundi 04 d=C3=A9cembre 2023 =C3=A0 17:16 +0800, Zeng Chi a =C3=A9crit=C2= =A0: > This patch fixes memory leaks on error escapes in wave5_vpu_open_enc() > and wave5_vpu_open_dec(). Please avoid sending twice the same patch. This is still a NAK. regards, Nicolas >=20 > Fixes: 9707a6254a8a ("media: chips-media: wave5: Add the v4l2 layer") > Signed-off-by: Zeng Chi > --- > drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 5 +++-- > drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c | 5 +++-- > 2 files changed, 6 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/d= rivers/media/platform/chips-media/wave5/wave5-vpu-dec.c > index 8b1417ece96e..b0a045346bb7 100644 > --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c > +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c > @@ -1802,9 +1802,10 @@ static int wave5_vpu_open_dec(struct file *filp) > spin_lock_init(&inst->state_spinlock); > =20 > inst->codec_info =3D kzalloc(sizeof(*inst->codec_info), GFP_KERNEL); > - if (!inst->codec_info) > + if (!inst->codec_info) { > + kfree(inst); > return -ENOMEM; > - > + } > v4l2_fh_init(&inst->v4l2_fh, vdev); > filp->private_data =3D &inst->v4l2_fh; > v4l2_fh_add(&inst->v4l2_fh); > diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/d= rivers/media/platform/chips-media/wave5/wave5-vpu-enc.c > index f29cfa3af94a..bc94de9ea546 100644 > --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c > +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c > @@ -1546,9 +1546,10 @@ static int wave5_vpu_open_enc(struct file *filp) > inst->ops =3D &wave5_vpu_enc_inst_ops; > =20 > inst->codec_info =3D kzalloc(sizeof(*inst->codec_info), GFP_KERNEL); > - if (!inst->codec_info) > + if (!inst->codec_info) { > + kfree(inst); > return -ENOMEM; > - > + } > v4l2_fh_init(&inst->v4l2_fh, vdev); > filp->private_data =3D &inst->v4l2_fh; > v4l2_fh_add(&inst->v4l2_fh);