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 4E45731EB1E; Sun, 1 Jun 2025 23:41:16 +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=1748821277; cv=none; b=sUjbDY9b7B74pSt+NmReS61pY/SzLRVO/PeVfE0I0vQkF8EeC1ReENMH0Rag94gAGJxHNBnA9lk/iJBTQOwBTiY1L+b9Rqw6VdNcSkRuaeIS1m/Q/S7Ya0Vyi+k/INk2s3BFWCMTXQe66qrhcDChZVyfPexAEHcCFmnO7DODcOk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748821277; c=relaxed/simple; bh=VF4j48O/cWgREqTqPQG4SIrIc94zW6XMSKcgN3iaLwM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=hIcP4gMTnwNj6Kur+bkwlJDS9P+qaUvbCacycg19fbFMra3r6lmmprLOBylM/4PiydHjPC4iY4pj6axmfl6kPo/Tn3e9IUMXuxN0Owc/2tmFH5jJwZTpipG2adY6xsbrRQJ+wrDc2/gnYL4ZNOmJfeUltdQQgsJiSRAReTASqOw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PhJgIFyw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PhJgIFyw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13AB3C4CEEE; Sun, 1 Jun 2025 23:41:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1748821276; bh=VF4j48O/cWgREqTqPQG4SIrIc94zW6XMSKcgN3iaLwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PhJgIFywAr55/Ea41uJX5ORIFqSnlz6FrNS6R/LcRen0VaSfyF0REH0co5TvjsvFo 4aqoU+T5VJn7E+bYx7FmA5dAee8bMxtYVRSA56iWu/fwxXBCUbAJXQdFnDZCQCVmw8 yeC/C9SdSBIAU/Y+9pEk3nk7/KTX1BSUgLfmq+QPrSP+j0WRPEzM461iKaYM330nMn PFlYz88ya0qy0kfhpY8aFrU44tx5usx2TH14wr6U8/XJwgV+cn3g1V3jA+VkUJqOjm QagIp4dYch3eHGJ66ng8kpawZ9RDxi7P6USa6+WhFtF8v8UWFTE34Og42ZIFovhgyg pWppsngRNRB0w== From: Sasha Levin To: patches@lists.linux.dev, stable@vger.kernel.org Cc: Nicolas Dufresne , Hans Verkuil , Sasha Levin , ezequiel@vanguardiasur.com.ar, mchehab@kernel.org, gregkh@linuxfoundation.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 26/58] media: rkvdec: Initialize the m2m context before the controls Date: Sun, 1 Jun 2025 19:39:39 -0400 Message-Id: <20250601234012.3516352-26-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250601234012.3516352-1-sashal@kernel.org> References: <20250601234012.3516352-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.140 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Nicolas Dufresne [ Upstream commit d43d7db3c8a1868dcbc6cb8de90a3cdf309d6cbb ] Setting up the control handler calls into .s_ctrl ops. While validating the controls the ops may need to access some of the context state, which could lead to a crash if not properly initialized. Signed-off-by: Nicolas Dufresne Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- Now let me analyze the specific changes proposed in the commit: ## Analysis **YES** This commit should be backported to stable kernel trees. Here's my extensive analysis: ### Core Issue Analysis The commit addresses a critical initialization order bug that can lead to crashes. The problem occurs in the `rkvdec_open()` function at lines 822-830 in the current code: 1. **Current problematic order:** - Line 822: `rkvdec_init_ctrls(ctx)` is called first - Line 826-830: `v4l2_m2m_ctx_init()` is called second 2. **The problem:** According to the commit message and my analysis of the kernel documentation, `v4l2_ctrl_handler_setup()` (called inside `rkvdec_init_ctrls()`) calls `.s_ctrl` for all controls unconditionally to initialize hardware to default values. The `.s_ctrl` handlers may need to access the m2m context state, but if the m2m context (`ctx->fh.m2m_ctx`) isn't initialized yet, this can cause a crash or undefined behavior. ### Code Changes Analysis The fix is minimal and surgical: - **Lines moved:** The initialization order is swapped - m2m context initialization moves before control handler setup - **Error handling updated:** The error handling paths are correctly updated to match the new initialization order - **No functional changes:** The fix doesn't change driver functionality, only initialization sequence ### Why This Should Be Backported 1. **Fixes a real crash bug:** This addresses a potential crash scenario that affects users 2. **Small and contained:** The change is minimal - just reordering initialization and updating error paths 3. **Low regression risk:** Moving m2m init before control init is safer since m2m context doesn't depend on controls, but controls may depend on m2m context 4. **Follows established patterns:** Similar commit #2 in the historical examples shows a "YES" backport for proper initialization order in V4L2 drivers 5. **Critical subsystem:** Media drivers crashing can affect user applications ### Comparison with Historical Commits - **Similar to commit #2 (YES):** Also fixes initialization order in V4L2 media driver to prevent crashes - **Similar to commit #4 (YES):** Media driver fix that's low-risk and contained - **Unlike commits #1, #3, #5 (NO):** This actually fixes a bug rather than just cleanup/code style improvements ### Stable Tree Criteria Met ✅ **Important bugfix:** Prevents crashes ✅ **Minimal risk:** Simple reordering with no side effects ✅ **Small change:** Only affects initialization sequence ✅ **No architectural changes:** Pure bug fix ✅ **Confined to subsystem:** Only affects rkvdec driver The fix follows the stable tree rules perfectly - it's an important crash prevention fix with minimal regression risk, making it an ideal backport candidate. drivers/staging/media/rkvdec/rkvdec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index d16cf4115d03a..6cf551cc861a4 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -821,24 +821,24 @@ static int rkvdec_open(struct file *filp) rkvdec_reset_decoded_fmt(ctx); v4l2_fh_init(&ctx->fh, video_devdata(filp)); - ret = rkvdec_init_ctrls(ctx); - if (ret) - goto err_free_ctx; - ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(rkvdec->m2m_dev, ctx, rkvdec_queue_init); if (IS_ERR(ctx->fh.m2m_ctx)) { ret = PTR_ERR(ctx->fh.m2m_ctx); - goto err_cleanup_ctrls; + goto err_free_ctx; } + ret = rkvdec_init_ctrls(ctx); + if (ret) + goto err_cleanup_m2m_ctx; + filp->private_data = &ctx->fh; v4l2_fh_add(&ctx->fh); return 0; -err_cleanup_ctrls: - v4l2_ctrl_handler_free(&ctx->ctrl_hdl); +err_cleanup_m2m_ctx: + v4l2_m2m_ctx_release(ctx->fh.m2m_ctx); err_free_ctx: kfree(ctx); -- 2.39.5 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BBECAC5B543 for ; Mon, 2 Jun 2025 01:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LqsxuTNuEIMRsu2NWlsLbL4RcMkh85BOmTDHFQ1obUA=; b=hW2FCoJcbnxRPP HYENSfkly7tKfYOxux1HLhcv8raHnK/oCWf2Q3xLygERaYHrY/onRSeq6L0s8RR9u6K1On5r4uOeI K7Dh1Shh2ut+I+aw28GToVAx8s4lmLGYZzjACSre6N3fU3pH1IBuqvlNEFz0xL6JUzvraIyG+Gqv7 1FQMLRHm2wQIk7417KaTf2WP7MHYQLASjDzt3F7uXxHwlqOP6YYNDjJc4HMAyFvcfmJzv2MknTdAL 0qvXtiTqqKAkEiu+CPCsYRVlssZfRRrOE4zG97W3AjoNs82iLGORgsJpV7mdASDufHgZM+mItIxo+ BVsVfbrK6gdvuvRJPPrA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uLtY1-00000006Pgm-2F7Z; Mon, 02 Jun 2025 01:01:05 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uLsIq-000000069P7-3ir3 for linux-rockchip@bombadil.infradead.org; Sun, 01 Jun 2025 23:41:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:Content-Type :MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=Ablul3z3Ji+kzCl2BgCHn2xSjaM1mWVmKvAaBXfijls=; b=hxeR3huCCDeWFLlnfOttU/DZ9Z CCUGE8dbfyZV2npovwVat4EGAn3y7ZQbrI8Wetghr3fxLLty1RnGxGiZsmFGxrMV0WPKcb8DNYPIe Pfl7Os7wWUuKts6qZSMrh8mE2OfEBf8ei4vRTVWPddud3mR/gVWLmXoItnPvDxyKp2BI1JrVjzXNt 3A+nZjHTXQiWTnH2ty8ysuBx7XjUk9w3MVruvdeRe6zz0lK77fQwiDJ20lPe2Q7wU8l2w2PVDJnQe c7HfYR3ig1Um/E3efrw13QEGJQdBOTGYMdeFkCyyOpanQLbGBXXylP7+XICL8EMAQHIqk0VVp5022 Q7OR0ppg==; Received: from nyc.source.kernel.org ([147.75.193.91]) by desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uLsIn-00000000YYZ-3HwA for linux-rockchip@lists.infradead.org; Sun, 01 Jun 2025 23:41:19 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id B07DDA4FB4F; Sun, 1 Jun 2025 23:41:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13AB3C4CEEE; Sun, 1 Jun 2025 23:41:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1748821276; bh=VF4j48O/cWgREqTqPQG4SIrIc94zW6XMSKcgN3iaLwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PhJgIFywAr55/Ea41uJX5ORIFqSnlz6FrNS6R/LcRen0VaSfyF0REH0co5TvjsvFo 4aqoU+T5VJn7E+bYx7FmA5dAee8bMxtYVRSA56iWu/fwxXBCUbAJXQdFnDZCQCVmw8 yeC/C9SdSBIAU/Y+9pEk3nk7/KTX1BSUgLfmq+QPrSP+j0WRPEzM461iKaYM330nMn PFlYz88ya0qy0kfhpY8aFrU44tx5usx2TH14wr6U8/XJwgV+cn3g1V3jA+VkUJqOjm QagIp4dYch3eHGJ66ng8kpawZ9RDxi7P6USa6+WhFtF8v8UWFTE34Og42ZIFovhgyg pWppsngRNRB0w== From: Sasha Levin To: patches@lists.linux.dev, stable@vger.kernel.org Cc: Nicolas Dufresne , Hans Verkuil , Sasha Levin , ezequiel@vanguardiasur.com.ar, mchehab@kernel.org, gregkh@linuxfoundation.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 26/58] media: rkvdec: Initialize the m2m context before the controls Date: Sun, 1 Jun 2025 19:39:39 -0400 Message-Id: <20250601234012.3516352-26-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250601234012.3516352-1-sashal@kernel.org> References: <20250601234012.3516352-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.140 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250602_004118_235249_5E858A13 X-CRM114-Status: GOOD ( 17.36 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org RnJvbTogTmljb2xhcyBEdWZyZXNuZSA8bmljb2xhcy5kdWZyZXNuZUBjb2xsYWJvcmEuY29tPgoK WyBVcHN0cmVhbSBjb21taXQgZDQzZDdkYjNjOGExODY4ZGNiYzZjYjhkZTkwYTNjZGYzMDlkNmNi YiBdCgpTZXR0aW5nIHVwIHRoZSBjb250cm9sIGhhbmRsZXIgY2FsbHMgaW50byAuc19jdHJsIG9w cy4gV2hpbGUgdmFsaWRhdGluZwp0aGUgY29udHJvbHMgdGhlIG9wcyBtYXkgbmVlZCB0byBhY2Nl c3Mgc29tZSBvZiB0aGUgY29udGV4dCBzdGF0ZSwgd2hpY2gKY291bGQgbGVhZCB0byBhIGNyYXNo IGlmIG5vdCBwcm9wZXJseSBpbml0aWFsaXplZC4KClNpZ25lZC1vZmYtYnk6IE5pY29sYXMgRHVm cmVzbmUgPG5pY29sYXMuZHVmcmVzbmVAY29sbGFib3JhLmNvbT4KU2lnbmVkLW9mZi1ieTogSGFu cyBWZXJrdWlsIDxodmVya3VpbEB4czRhbGwubmw+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmlu IDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCgpOb3cgbGV0IG1lIGFuYWx5emUgdGhlIHNwZWNpZmlj IGNoYW5nZXMgcHJvcG9zZWQgaW4gdGhlIGNvbW1pdDogIyMKQW5hbHlzaXMgKipZRVMqKiBUaGlz IGNvbW1pdCBzaG91bGQgYmUgYmFja3BvcnRlZCB0byBzdGFibGUga2VybmVsCnRyZWVzLiBIZXJl J3MgbXkgZXh0ZW5zaXZlIGFuYWx5c2lzOiAjIyMgQ29yZSBJc3N1ZSBBbmFseXNpcyBUaGUgY29t bWl0CmFkZHJlc3NlcyBhIGNyaXRpY2FsIGluaXRpYWxpemF0aW9uIG9yZGVyIGJ1ZyB0aGF0IGNh biBsZWFkIHRvIGNyYXNoZXMuClRoZSBwcm9ibGVtIG9jY3VycyBpbiB0aGUgYHJrdmRlY19vcGVu KClgIGZ1bmN0aW9uIGF0IGxpbmVzIDgyMi04MzAgaW4KdGhlIGN1cnJlbnQgY29kZTogMS4gKipD dXJyZW50IHByb2JsZW1hdGljIG9yZGVyOioqIC0gTGluZSA4MjI6CmBya3ZkZWNfaW5pdF9jdHJs cyhjdHgpYCBpcyBjYWxsZWQgZmlyc3QgLSBMaW5lIDgyNi04MzA6CmB2NGwyX20ybV9jdHhfaW5p dCgpYCBpcyBjYWxsZWQgc2Vjb25kIDIuICoqVGhlIHByb2JsZW06KiogQWNjb3JkaW5nIHRvCnRo ZSBjb21taXQgbWVzc2FnZSBhbmQgbXkgYW5hbHlzaXMgb2YgdGhlIGtlcm5lbCBkb2N1bWVudGF0 aW9uLApgdjRsMl9jdHJsX2hhbmRsZXJfc2V0dXAoKWAgKGNhbGxlZCBpbnNpZGUgYHJrdmRlY19p bml0X2N0cmxzKClgKSBjYWxscwpgLnNfY3RybGAgZm9yIGFsbCBjb250cm9scyB1bmNvbmRpdGlv bmFsbHkgdG8gaW5pdGlhbGl6ZSBoYXJkd2FyZSB0bwpkZWZhdWx0IHZhbHVlcy4gVGhlIGAuc19j dHJsYCBoYW5kbGVycyBtYXkgbmVlZCB0byBhY2Nlc3MgdGhlIG0ybQpjb250ZXh0IHN0YXRlLCBi dXQgaWYgdGhlIG0ybSBjb250ZXh0IChgY3R4LT5maC5tMm1fY3R4YCkgaXNuJ3QKaW5pdGlhbGl6 ZWQgeWV0LCB0aGlzIGNhbiBjYXVzZSBhIGNyYXNoIG9yIHVuZGVmaW5lZCBiZWhhdmlvci4gIyMj IENvZGUKQ2hhbmdlcyBBbmFseXNpcyBUaGUgZml4IGlzIG1pbmltYWwgYW5kIHN1cmdpY2FsOiAt ICoqTGluZXMgbW92ZWQ6KiogVGhlCmluaXRpYWxpemF0aW9uIG9yZGVyIGlzIHN3YXBwZWQgLSBt Mm0gY29udGV4dCBpbml0aWFsaXphdGlvbiBtb3ZlcwpiZWZvcmUgY29udHJvbCBoYW5kbGVyIHNl dHVwIC0gKipFcnJvciBoYW5kbGluZyB1cGRhdGVkOioqIFRoZSBlcnJvcgpoYW5kbGluZyBwYXRo cyBhcmUgY29ycmVjdGx5IHVwZGF0ZWQgdG8gbWF0Y2ggdGhlIG5ldyBpbml0aWFsaXphdGlvbgpv cmRlciAtICoqTm8gZnVuY3Rpb25hbCBjaGFuZ2VzOioqIFRoZSBmaXggZG9lc24ndCBjaGFuZ2Ug ZHJpdmVyCmZ1bmN0aW9uYWxpdHksIG9ubHkgaW5pdGlhbGl6YXRpb24gc2VxdWVuY2UgIyMjIFdo eSBUaGlzIFNob3VsZCBCZQpCYWNrcG9ydGVkIDEuICoqRml4ZXMgYSByZWFsIGNyYXNoIGJ1Zzoq KiBUaGlzIGFkZHJlc3NlcyBhIHBvdGVudGlhbApjcmFzaCBzY2VuYXJpbyB0aGF0IGFmZmVjdHMg dXNlcnMgMi4gKipTbWFsbCBhbmQgY29udGFpbmVkOioqIFRoZSBjaGFuZ2UKaXMgbWluaW1hbCAt IGp1c3QgcmVvcmRlcmluZyBpbml0aWFsaXphdGlvbiBhbmQgdXBkYXRpbmcgZXJyb3IgcGF0aHMg My4KKipMb3cgcmVncmVzc2lvbiByaXNrOioqIE1vdmluZyBtMm0gaW5pdCBiZWZvcmUgY29udHJv bCBpbml0IGlzIHNhZmVyCnNpbmNlIG0ybSBjb250ZXh0IGRvZXNuJ3QgZGVwZW5kIG9uIGNvbnRy b2xzLCBidXQgY29udHJvbHMgbWF5IGRlcGVuZCBvbgptMm0gY29udGV4dCA0LiAqKkZvbGxvd3Mg ZXN0YWJsaXNoZWQgcGF0dGVybnM6KiogU2ltaWxhciBjb21taXQgIzIgaW4KdGhlIGhpc3Rvcmlj YWwgZXhhbXBsZXMgc2hvd3MgYSAiWUVTIiBiYWNrcG9ydCBmb3IgcHJvcGVyIGluaXRpYWxpemF0 aW9uCm9yZGVyIGluIFY0TDIgZHJpdmVycyA1LiAqKkNyaXRpY2FsIHN1YnN5c3RlbToqKiBNZWRp YSBkcml2ZXJzIGNyYXNoaW5nCmNhbiBhZmZlY3QgdXNlciBhcHBsaWNhdGlvbnMgIyMjIENvbXBh cmlzb24gd2l0aCBIaXN0b3JpY2FsIENvbW1pdHMgLQoqKlNpbWlsYXIgdG8gY29tbWl0ICMyIChZ RVMpOioqIEFsc28gZml4ZXMgaW5pdGlhbGl6YXRpb24gb3JkZXIgaW4gVjRMMgptZWRpYSBkcml2 ZXIgdG8gcHJldmVudCBjcmFzaGVzIC0gKipTaW1pbGFyIHRvIGNvbW1pdCAjNCAoWUVTKToqKiBN ZWRpYQpkcml2ZXIgZml4IHRoYXQncyBsb3ctcmlzayBhbmQgY29udGFpbmVkIC0gKipVbmxpa2Ug Y29tbWl0cyAjMSwgIzMsICM1CihOTyk6KiogVGhpcyBhY3R1YWxseSBmaXhlcyBhIGJ1ZyByYXRo ZXIgdGhhbiBqdXN0IGNsZWFudXAvY29kZSBzdHlsZQppbXByb3ZlbWVudHMgIyMjIFN0YWJsZSBU cmVlIENyaXRlcmlhIE1ldCDinIUgKipJbXBvcnRhbnQgYnVnZml4OioqClByZXZlbnRzIGNyYXNo ZXMg4pyFICoqTWluaW1hbCByaXNrOioqIFNpbXBsZSByZW9yZGVyaW5nIHdpdGggbm8gc2lkZQpl ZmZlY3RzIOKchSAqKlNtYWxsIGNoYW5nZToqKiBPbmx5IGFmZmVjdHMgaW5pdGlhbGl6YXRpb24g c2VxdWVuY2Ug4pyFICoqTm8KYXJjaGl0ZWN0dXJhbCBjaGFuZ2VzOioqIFB1cmUgYnVnIGZpeCDi nIUgKipDb25maW5lZCB0byBzdWJzeXN0ZW06KiogT25seQphZmZlY3RzIHJrdmRlYyBkcml2ZXIg VGhlIGZpeCBmb2xsb3dzIHRoZSBzdGFibGUgdHJlZSBydWxlcyBwZXJmZWN0bHkgLQppdCdzIGFu IGltcG9ydGFudCBjcmFzaCBwcmV2ZW50aW9uIGZpeCB3aXRoIG1pbmltYWwgcmVncmVzc2lvbiBy aXNrLAptYWtpbmcgaXQgYW4gaWRlYWwgYmFja3BvcnQgY2FuZGlkYXRlLgoKIGRyaXZlcnMvc3Rh Z2luZy9tZWRpYS9ya3ZkZWMvcmt2ZGVjLmMgfCAxNCArKysrKysrLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL3N0YWdpbmcvbWVkaWEvcmt2ZGVjL3JrdmRlYy5jIGIvZHJpdmVycy9zdGFnaW5nL21lZGlh L3JrdmRlYy9ya3ZkZWMuYwppbmRleCBkMTZjZjQxMTVkMDNhLi42Y2Y1NTFjYzg2MWE0IDEwMDY0 NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvbWVkaWEvcmt2ZGVjL3JrdmRlYy5jCisrKyBiL2RyaXZl cnMvc3RhZ2luZy9tZWRpYS9ya3ZkZWMvcmt2ZGVjLmMKQEAgLTgyMSwyNCArODIxLDI0IEBAIHN0 YXRpYyBpbnQgcmt2ZGVjX29wZW4oc3RydWN0IGZpbGUgKmZpbHApCiAJcmt2ZGVjX3Jlc2V0X2Rl Y29kZWRfZm10KGN0eCk7CiAJdjRsMl9maF9pbml0KCZjdHgtPmZoLCB2aWRlb19kZXZkYXRhKGZp bHApKTsKIAotCXJldCA9IHJrdmRlY19pbml0X2N0cmxzKGN0eCk7Ci0JaWYgKHJldCkKLQkJZ290 byBlcnJfZnJlZV9jdHg7Ci0KIAljdHgtPmZoLm0ybV9jdHggPSB2NGwyX20ybV9jdHhfaW5pdChy a3ZkZWMtPm0ybV9kZXYsIGN0eCwKIAkJCQkJICAgIHJrdmRlY19xdWV1ZV9pbml0KTsKIAlpZiAo SVNfRVJSKGN0eC0+ZmgubTJtX2N0eCkpIHsKIAkJcmV0ID0gUFRSX0VSUihjdHgtPmZoLm0ybV9j dHgpOwotCQlnb3RvIGVycl9jbGVhbnVwX2N0cmxzOworCQlnb3RvIGVycl9mcmVlX2N0eDsKIAl9 CiAKKwlyZXQgPSBya3ZkZWNfaW5pdF9jdHJscyhjdHgpOworCWlmIChyZXQpCisJCWdvdG8gZXJy X2NsZWFudXBfbTJtX2N0eDsKKwogCWZpbHAtPnByaXZhdGVfZGF0YSA9ICZjdHgtPmZoOwogCXY0 bDJfZmhfYWRkKCZjdHgtPmZoKTsKIAogCXJldHVybiAwOwogCi1lcnJfY2xlYW51cF9jdHJsczoK LQl2NGwyX2N0cmxfaGFuZGxlcl9mcmVlKCZjdHgtPmN0cmxfaGRsKTsKK2Vycl9jbGVhbnVwX20y bV9jdHg6CisJdjRsMl9tMm1fY3R4X3JlbGVhc2UoY3R4LT5maC5tMm1fY3R4KTsKIAogZXJyX2Zy ZWVfY3R4OgogCWtmcmVlKGN0eCk7Ci0tIAoyLjM5LjUKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpMaW51eC1yb2NrY2hpcCBtYWlsaW5nIGxpc3QKTGlu dXgtcm9ja2NoaXBAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LXJvY2tjaGlwCg==