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 E55E826B087; Thu, 13 Feb 2025 15:32:25 +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=1739460746; cv=none; b=FHk0vOgat8qDxemSiXW1cVgLfS0HebV/vyS25RcVcC3v7ejcehkQrXHljKCKLxghx91nkIqs1qXFxhNi7kS8BXyumAH1cb6IJBPVGK0ujYv+I+NCPasZphGyI9QA53IVcURttcPbs2DFHdndPDF7iTjzQ8goVTsb5HJIp0B9lGY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739460746; c=relaxed/simple; bh=fzFB36MfuvHI9H6+sZNYFTWRRCO4YnaSxLWuI6yerLU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PqFWM87clSPPxaoQb11jQtkKp2my6LVcm/aNUZHyPvD+nJgHx/L0FNHsQ82t2YDFVMTW1Nk+/zzDBQWGJJj/omO7Fghdvx7X1d7El7RkAHHObtQ5yOY/C3SwtPqiVhgrNTCuJGRSN+xcW2aKaB4paaMMs5Impa0GynmQMIAot0s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nRjtOzt/; 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="nRjtOzt/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4443EC4CEE4; Thu, 13 Feb 2025 15:32:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739460745; bh=fzFB36MfuvHI9H6+sZNYFTWRRCO4YnaSxLWuI6yerLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nRjtOzt/vEQq19QCKcdb5rzognQV25htw0e2ZiAyxLAoF45eemsmjuVcotNJQeXsK 4GZ6Bw7wXTgSlOrIUyEdg4lvToH04FOPDcxH+OL2UFcabK4vl6vSVJ7P9GCehnmmh2 drAehDsnEcmOOojUSAuSJeM6TTSRI3SCcWzREWP0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sakari Ailus , Mehdi Djait , Mauro Carvalho Chehab Subject: [PATCH 6.6 199/273] media: ccs: Clean up parsed CCS static data on parse failure Date: Thu, 13 Feb 2025 15:29:31 +0100 Message-ID: <20250213142415.189901764@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250213142407.354217048@linuxfoundation.org> References: <20250213142407.354217048@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sakari Ailus commit da73efa8e675a2b58f1c7ae61201acfe57714bf7 upstream. ccs_data_parse() releases the allocated in-memory data structure when the parser fails, but it does not clean up parsed metadata that is there to help access the actual data. Do that, in order to return the data structure in a sane state. Fixes: a6b396f410b1 ("media: ccs: Add CCS static data parser library") Cc: stable@vger.kernel.org Signed-off-by: Sakari Ailus Reviewed-by: Mehdi Djait Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/i2c/ccs/ccs-data.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- a/drivers/media/i2c/ccs/ccs-data.c +++ b/drivers/media/i2c/ccs/ccs-data.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "ccs-data-defs.h" @@ -948,15 +949,15 @@ int ccs_data_parse(struct ccs_data_conta rval = __ccs_data_parse(&bin, ccsdata, data, len, dev, verbose); if (rval) - return rval; + goto out_cleanup; rval = bin_backing_alloc(&bin); if (rval) - return rval; + goto out_cleanup; rval = __ccs_data_parse(&bin, ccsdata, data, len, dev, false); if (rval) - goto out_free; + goto out_cleanup; if (verbose && ccsdata->version) print_ccs_data_version(dev, ccsdata->version); @@ -965,15 +966,16 @@ int ccs_data_parse(struct ccs_data_conta rval = -EPROTO; dev_dbg(dev, "parsing mismatch; base %p; now %p; end %p\n", bin.base, bin.now, bin.end); - goto out_free; + goto out_cleanup; } ccsdata->backing = bin.base; return 0; -out_free: +out_cleanup: kvfree(bin.base); + memset(ccsdata, 0, sizeof(*ccsdata)); return rval; }