From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D83173E00A8; Fri, 15 May 2026 16:17:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778861847; cv=none; b=Kiaw8e2QnJNYOhmhCvFkp1rwbaGk6+CeZwvttnSFMuocE05kVnnFg7v38kfabk0upKmP0YQ0udnSgQWP/rPNeW/bH1/cZ4x53Y08hTTBrBFba7wv6m67QEiNDo6on+oEQ59aBmlQTCjJgbsbPYA0LfbehHtgcCEKGMBcZBCNGJo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778861847; c=relaxed/simple; bh=2K/pGYTEZsFSOBySGXefYVJf13RalNZmXVWT/L5Bid0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lHLWgIX9Tv05AU9amYjnebxhHbIFhAfoMQCdZdBNEDqWnDakITwGLUQ7AWnLVJqTlHPgWO/h7+Cbu4XdJEUY9HytFiJ4QKFzdz4pfskDrwZqLhIh1wqcscJvygtAJ3A0woD3TSMv+0rWQxDwmVsmeZ3aYR5LpLLhAhFaasMk1mM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mEK1fPkK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mEK1fPkK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B013C2BCB3; Fri, 15 May 2026 16:17:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778861847; bh=2K/pGYTEZsFSOBySGXefYVJf13RalNZmXVWT/L5Bid0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mEK1fPkKXMKPOMyjKjaZdy+HTCZ9MTaiwx1k4QUxbZ70CM6Sr47dyl8A0PfywLWaX r7WRdLyB5Fu8+AqfZQNSqs6yOQYtHpnjOg9dqO94ksppBm2ihqnboSb9kYBKU8hnaW E74E4yFllUNkypDHVoQ4fJQkmkcc6KgO86QPpZQU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexander Koskovich , Sakari Ailus , Hans Verkuil Subject: [PATCH 6.18 012/188] media: i2c: ov8856: free control handler on error in ov8856_init_controls() Date: Fri, 15 May 2026 17:47:09 +0200 Message-ID: <20260515154657.573824492@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260515154657.309489048@linuxfoundation.org> References: <20260515154657.309489048@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexander Koskovich commit f75e160745663ce9b13362ae6e90bd439c58df69 upstream. The control handler wasn't freed if adding controls failed, add an error exit label and convert the existing error return to use it. Fixes: 879347f0c258 ("media: ov8856: Add support for OV8856 sensor") Cc: stable@vger.kernel.org Signed-off-by: Alexander Koskovich Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil Signed-off-by: Greg Kroah-Hartman --- drivers/media/i2c/ov8856.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/drivers/media/i2c/ov8856.c +++ b/drivers/media/i2c/ov8856.c @@ -1951,12 +1951,18 @@ static int ov8856_init_controls(struct o V4L2_CID_HFLIP, 0, 1, 1, 0); v4l2_ctrl_new_std(ctrl_hdlr, &ov8856_ctrl_ops, V4L2_CID_VFLIP, 0, 1, 1, 0); - if (ctrl_hdlr->error) - return ctrl_hdlr->error; + if (ctrl_hdlr->error) { + ret = ctrl_hdlr->error; + goto err_ctrl_handler_free; + } ov8856->sd.ctrl_handler = ctrl_hdlr; return 0; + +err_ctrl_handler_free: + v4l2_ctrl_handler_free(ctrl_hdlr); + return ret; } static void ov8856_update_pad_format(struct ov8856 *ov8856,