From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Tim Ruffing Newsgroups: gmane.emacs.bugs Subject: bug#68272: [PATCH] Fix -1 leaking from C to lisp in 'read-event' etc. Date: Fri, 05 Jan 2024 22:19:10 +0100 Message-ID: <46480759b6d89b5a4864e8ee1b986817366a56e5.camel@timruffing.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-PUaU02Ozv+LlZk/Klo3Z" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4157"; mail-complaints-to="usenet@ciao.gmane.io" To: 68272@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 05 22:20:28 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rLrcB-0000tv-Vq for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 05 Jan 2024 22:20:28 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLrbv-0003dF-DT; Fri, 05 Jan 2024 16:20:12 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLrbj-0003cK-JO for bug-gnu-emacs@gnu.org; Fri, 05 Jan 2024 16:19:59 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLrbh-000872-TQ for bug-gnu-emacs@gnu.org; Fri, 05 Jan 2024 16:19:59 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLrbl-0001T4-T5 for bug-gnu-emacs@gnu.org; Fri, 05 Jan 2024 16:20:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Tim Ruffing Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 05 Jan 2024 21:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68272 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.17044895815609 (code B ref -1); Fri, 05 Jan 2024 21:20:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 5 Jan 2024 21:19:41 +0000 Original-Received: from localhost ([127.0.0.1]:58070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLrbQ-0001SO-BF for submit@debbugs.gnu.org; Fri, 05 Jan 2024 16:19:41 -0500 Original-Received: from lists.gnu.org ([2001:470:142::17]:52118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLrbM-0001S9-Qa for submit@debbugs.gnu.org; Fri, 05 Jan 2024 16:19:38 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLrbC-0003Zm-Ak for bug-gnu-emacs@gnu.org; Fri, 05 Jan 2024 16:19:26 -0500 Original-Received: from mout-p-201.mailbox.org ([80.241.56.171]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1rLrb5-00083l-OD for bug-gnu-emacs@gnu.org; Fri, 05 Jan 2024 16:19:25 -0500 Original-Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4T6GYC2kjyz9sZL for ; Fri, 5 Jan 2024 22:19:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=timruffing.de; s=MBO0001; t=1704489551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type:autocrypt:autocrypt; bh=CWsG5HWoHoGdfY0bN7k2KKpUM7KpAitEvUHIGhjiwtE=; b=HdzdKyuhTgoKHQds+wHIlKvAW2BAT3NLlV4whrsZ64G9hqPNazcM4cYT8sFCdvOafkhl7O 1SX4chU7JugrHE7kYtBRqgKNtSysiYBSxzRebeer5xqQwAR6kl+Nc8S88slPNt5/RV1CUw kKfDZLLZrvp5H0hjmXghlEjQJwe7949WFKPB7YzhX0iLCK+pTly/AEQJcfTj1gbjObaKJ/ XvgInztFNb/MYf3Dcgq6Av2Rbv5t4Cal0t+59QAChPF3SyyageWdKhbf6ELvjzkm8Jgmr+ hwJnBu7mw5n3OheFM0x+1XNZkSAmEHlhQUOZCGNQpN09GSMoo2wlWcTB3VcYYA== Autocrypt: addr=crypto@timruffing.de; prefer-encrypt=mutual; keydata=mQINBFz4LCMBEADLgtVg3uT+kybmXDPpXMvd8KBhTfAL5DP6umC9hkv/WHnfbCOUujhyvBljckcExAFr7tDYSgIjqa0L32SCT0NEaeY/s3WOYIacjBIEjTrgt01401lOWoX3XeYTWOlVUmUg+4iJPmBSPaj2bJR9Sq6NZhQjQ8K24VMtUNMiDeIIcstLkvQ4ZWkSuBUQJrJ0gUCZcUHNEyyGyZj1HOVGqGK7hTIiT1TfAgYKDDzk955LzgxbmATJWQLD7AGUIjKf/s418PTxI7Hh5ptH+Rq30+wkfvzJumYgkWUzeV6jzlOST5LkrFWQTfCXNvFNxSI9FVKjDIJZ7nQlgd+qNpGop90S3UqA8ofoG9liJm/jmbgIfJTgIiJpulycJD90PyJiWxtGshuZnHjCpkmU5vc1ZbuYyzH2wLoABSBsjy3Tb/25W2mnYnsOcVo1sWOGl+08Lb63ocVYGY27OrAIsv35pS/gMSGcJVg/EmPIM4+PmjeOxDlrJEW+8YzjKV9XtDv6VcBT1/OcA64knWC7JAGf0CGRodpolDjyfFRLOPV2/UbyOMJZjkxKTtV0je/RiMTupIHWcmimkvzpNo8D8U+Ac7KTPuPBrbj8EWeTbd/sK6bncjPL2DLomov0gCg/qlgObYmZ834+tQcThIBi3cj1cRj/0yKPy1uHgk2P2jO5i9AXGQARAQABtB9UaW0gUnVmZmluZyA8dGltQHRpbXJ1ZmZpbmcuZGU+iQJXBBMBCABBAhsBBQsJCAcCBhUKCQgLAgQWAgMBAh4 BAheAAhkBFiEECeA/hxCS5A4QbpArM7yGq4D/ Received-SPF: pass client-ip=80.241.56.171; envelope-from=crypto@timruffing.de; helo=mout-p-201.mailbox.org X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:277417 Archived-At: --=-PUaU02Ozv+LlZk/Klo3Z Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 'read_char' in src/keyboard.c returns -1 to indicate the end of a keyboard macro. This case is supposed to be propagated via=20 'read_key_sequence' and 'command_loop_2' to 'Fexecute_kbd_macro'. But 'read_key_sequence' is not the only caller of 'read_char'. It is also called by 'read-event' and similar lisp functions, and in that case, the magic C return value -1 is wrongly propagated to the lisp caller.=C2=A0 There are at least workarounds for this bug in at least three lisp modules in the code base, in subr.el, in calc and most recently added in dbus.el (bug #62018), see the attached patches. These patches are supposed to resolve the underlying issue, and then remove the workarounds. --=-PUaU02Ozv+LlZk/Klo3Z Content-Disposition: attachment; filename="0001-Extract-check-for-end-of-macro-to-function.patch" Content-Type: text/x-patch; name="0001-Extract-check-for-end-of-macro-to-function.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBmM2JkMGIzNDZlN2FhNDM1ZDc3OGU1NmI5YTdjNmExMjMzMTVkZjE4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW0gUnVmZmluZyA8Y3J5cHRvQHRpbXJ1ZmZpbmcuZGU+CkRh dGU6IFdlZCwgMjcgRGVjIDIwMjMgMTQ6MjY6MjYgKzAxMDAKU3ViamVjdDogW1BBVENIIDEvNF0g RXh0cmFjdCBjaGVjayBmb3IgZW5kIG9mIG1hY3JvIHRvIGZ1bmN0aW9uCgoqIHNyYy9tYWNyb3Mu aCAoYXRfZW5kX29mX21hY3JvX3ApOgoqIHNyYy9tYWNyb3MuYyAoYXRfZW5kX29mX21hY3JvX3Ap OgpOZXcgZnVuY3Rpb24uCiogc3JjL2tleWJvYXJkLmMgKHJlYWRfY2hhcik6IFVzZSB0aGUgbmV3 IGZ1bmN0aW9uLgotLS0KIHNyYy9rZXlib2FyZC5jIHwgIDMgKy0tCiBzcmMvbWFjcm9zLmMgICB8 IDEyICsrKysrKysrKysrKwogc3JjL21hY3Jvcy5oICAgfCAgNSArKysrKwogMyBmaWxlcyBjaGFu Z2VkLCAxOCBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9r ZXlib2FyZC5jIGIvc3JjL2tleWJvYXJkLmMKaW5kZXggZTFkNzM4ZGQ2ZWYuLmQ0NzM2M2JjMzlm IDEwMDY0NAotLS0gYS9zcmMva2V5Ym9hcmQuYworKysgYi9zcmMva2V5Ym9hcmQuYwpAQCAtMjYy Nyw4ICsyNjI3LDcgQEAgcmVhZF9jaGFyIChpbnQgY29tbWFuZGZsYWcsIExpc3BfT2JqZWN0IG1h cCwKICAgICAgIC8qIEV4aXQgdGhlIG1hY3JvIGlmIHdlIGFyZSBhdCB0aGUgZW5kLgogCSBBbHNv LCBzb21lIHRoaW5ncyByZXBsYWNlIHRoZSBtYWNybyB3aXRoIHQKIAkgdG8gZm9yY2UgYW4gZWFy bHkgZXhpdC4gICovCi0gICAgICBpZiAoRVEgKFZleGVjdXRpbmdfa2JkX21hY3JvLCBRdCkKLQkg IHx8IGV4ZWN1dGluZ19rYmRfbWFjcm9faW5kZXggPj0gWEZJWE5BVCAoRmxlbmd0aCAoVmV4ZWN1 dGluZ19rYmRfbWFjcm8pKSkKKyAgICAgIGlmIChhdF9lbmRfb2ZfbWFjcm9fcCAoKSkKIAl7CiAJ ICBYU0VUSU5UIChjLCAtMSk7CiAJICBnb3RvIGV4aXQ7CmRpZmYgLS1naXQgYS9zcmMvbWFjcm9z LmMgYi9zcmMvbWFjcm9zLmMKaW5kZXggNWY3MWJjYmQzNjEuLjYyMTI5YmUxNjI5IDEwMDY0NAot LS0gYS9zcmMvbWFjcm9zLmMKKysrIGIvc3JjL21hY3Jvcy5jCkBAIC0zNTMsNiArMzUzLDE4IEBA IGluaXRfbWFjcm9zICh2b2lkKQogICBleGVjdXRpbmdfa2JkX21hY3JvID0gUW5pbDsKIH0KIAor LyogV2hldGhlciB0aGUgZXhlY3V0aW9uIG9mIGEgbWFjcm8gaGFzIHJlYWNoZWQgaXRzIGVuZC4K KyAgIEl0IG1ha2VzIG9ubHkgc2Vuc2UgdG8gY2FsbCB0aGlzIHdoZW4gd2hpbGUgZXhlY3V0aW5n IGEgbWFjcm8uICAqLworCitib29sCithdF9lbmRfb2ZfbWFjcm9fcCAodm9pZCkKK3sKKyAgZWFz c3VtZSAoIU5JTFAgKFZleGVjdXRpbmdfa2JkX21hY3JvKSk7CisgIC8qIFNvbWUgdGhpbmdzIHJl cGxhY2UgdGhlIG1hY3JvIHdpdGggdCB0byBmb3JjZSBhbiBlYXJseSBleGl0LiAgKi8KKyAgcmV0 dXJuIEVRIChWZXhlY3V0aW5nX2tiZF9tYWNybywgUXQpCisgICAgfHwgZXhlY3V0aW5nX2tiZF9t YWNyb19pbmRleCA+PSBYRklYTkFUIChGbGVuZ3RoIChWZXhlY3V0aW5nX2tiZF9tYWNybykpOwor fQorCiB2b2lkCiBzeW1zX29mX21hY3JvcyAodm9pZCkKIHsKZGlmZiAtLWdpdCBhL3NyYy9tYWNy b3MuaCBiL3NyYy9tYWNyb3MuaAppbmRleCA1MTU5OWEyOWJjZC4uNzg3MGFhNGRlMWQgMTAwNjQ0 Ci0tLSBhL3NyYy9tYWNyb3MuaAorKysgYi9zcmMvbWFjcm9zLmgKQEAgLTQ3LDQgKzQ3LDkgQEAg I2RlZmluZSBFTUFDU19NQUNST1NfSAogCiBleHRlcm4gdm9pZCBzdG9yZV9rYmRfbWFjcm9fY2hh ciAoTGlzcF9PYmplY3QpOwogCisvKiBXaGV0aGVyIHRoZSBleGVjdXRpb24gb2YgYSBtYWNybyBo YXMgcmVhY2hlZCBpdHMgZW5kLgorICAgSXQgbWFrZXMgb25seSBzZW5zZSB0byBjYWxsIHRoaXMg d2hlbiB3aGlsZSBleGVjdXRpbmcgYSBtYWNyby4gICovCisKK2V4dGVybiBib29sIGF0X2VuZF9v Zl9tYWNyb19wICh2b2lkKTsKKwogI2VuZGlmIC8qIEVNQUNTX01BQ1JPU19IICovCi0tIAoyLjQz LjAKCg== --=-PUaU02Ozv+LlZk/Klo3Z Content-Disposition: attachment; filename="0002-src-keyboard.c-requeued_events_pending_p-Revive.patch" Content-Type: text/x-patch; name="0002-src-keyboard.c-requeued_events_pending_p-Revive.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAyM2JjZWE0M2Q5YzU2ZTgyOWJmMjQ4Nzc2NTNkNTlhMDUxZTZjZDE5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW0gUnVmZmluZyA8Y3J5cHRvQHRpbXJ1ZmZpbmcuZGU+CkRh dGU6IFdlZCwgMjcgRGVjIDIwMjMgMTQ6Mjk6MzQgKzAxMDAKU3ViamVjdDogW1BBVENIIDIvNF0g KiBzcmMva2V5Ym9hcmQuYyAocmVxdWV1ZWRfZXZlbnRzX3BlbmRpbmdfcCk6IFJldml2ZQoKKiBz cmMva2V5Ym9hcmQuYyAocmVxdWV1ZWRfZXZlbnRzX3BlbmRpbmdfcCk6CkZpeCAncmVxdWV1ZWRf ZXZlbnRzX3BlbmRpbmdfcCcgZnVuY3Rpb24gYnkgYWRkaW5nIG1pc3NpbmcKJ1Z1bnJlYWRfKl9l dmVudCcgdmFyaWFibGVzLiBXaGVuICdyZXF1ZXVlZF9ldmVudHNfcGVuZGluZ19wJwp3YXMgYWRk ZWQgKGNvbW1pdCBiMTg3OGY0NTA4NjgzNjVmMjdhZjBjNzE5MDAyMzcwNTZhNDRmOTAwKSwKJ1Z1 bnJlYWRfY29tbWFuZF9ldmVudHMnIHdhcyB0aGUgb25seSB2YXJpYWJsZSBvZiB0aGlzIGtpbmQu CiogKEZpbnB1dF9wZW5kaW5nX3ApOiBBY3R1YWxseSB1c2UgdGhlIGNoYW5nZWQgZnVuY3Rpb24u Ci0tLQogc3JjL2tleWJvYXJkLmMgfCAxMCArKysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNSBp bnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9rZXlib2FyZC5j IGIvc3JjL2tleWJvYXJkLmMKaW5kZXggZDQ3MzYzYmMzOWYuLjA0MWI2MTZkOWFhIDEwMDY0NAot LS0gYS9zcmMva2V5Ym9hcmQuYworKysgYi9zcmMva2V5Ym9hcmQuYwpAQCAtMTE1NTYsNyArMTE1 NTYsNyBAQCBjbGVhcl9pbnB1dF9wZW5kaW5nICh2b2lkKQogfQogCiAvKiBSZXR1cm4gdHJ1ZSBp ZiB0aGVyZSBhcmUgcGVuZGluZyByZXF1ZXVlZCBldmVudHMuCi0gICBUaGlzIGlzbid0IHVzZWQg eWV0LiAgVGhlIGhvcGUgaXMgdG8gbWFrZSB3YWl0X3JlYWRpbmdfcHJvY2Vzc19vdXRwdXQKKyAg IEluIHRoZSBmdXR1cmUsIHRoZSBob3BlIGlzIHRvIG1ha2Ugd2FpdF9yZWFkaW5nX3Byb2Nlc3Nf b3V0cHV0CiAgICBjYWxsIGl0LCBhbmQgcmV0dXJuIGlmIGl0IHJ1bnMgTGlzcCBjb2RlIHRoYXQg dW5yZWFkcyBzb21ldGhpbmcuCiAgICBUaGUgcHJvYmxlbSBpcywga2JkX2J1ZmZlcl9nZXRfZXZl bnQgbmVlZHMgdG8gYmUgZml4ZWQgdG8ga25vdyB3aGF0CiAgICB0byBkbyBpbiB0aGF0IGNhc2Uu ICBJdCBpc24ndCB0cml2aWFsLiAgKi8KQEAgLTExNTY0LDcgKzExNTY0LDkgQEAgY2xlYXJfaW5w dXRfcGVuZGluZyAodm9pZCkKIGJvb2wKIHJlcXVldWVkX2V2ZW50c19wZW5kaW5nX3AgKHZvaWQp CiB7Ci0gIHJldHVybiAoQ09OU1AgKFZ1bnJlYWRfY29tbWFuZF9ldmVudHMpKTsKKyAgcmV0dXJu IChDT05TUCAoVnVucmVhZF9jb21tYW5kX2V2ZW50cykKKwkgIHx8IENPTlNQIChWdW5yZWFkX3Bv c3RfaW5wdXRfbWV0aG9kX2V2ZW50cykKKwkgIHx8IENPTlNQIChWdW5yZWFkX2lucHV0X21ldGhv ZF9ldmVudHMpKTsKIH0KIAogREVGVU4gKCJpbnB1dC1wZW5kaW5nLXAiLCBGaW5wdXRfcGVuZGlu Z19wLCBTaW5wdXRfcGVuZGluZ19wLCAwLCAxLCAwLApAQCAtMTE1NzUsOSArMTE1NzcsNyBAQCBE RUZVTiAoImlucHV0LXBlbmRpbmctcCIsIEZpbnB1dF9wZW5kaW5nX3AsIFNpbnB1dF9wZW5kaW5n X3AsIDAsIDEsIDAsCiBJZiBDSEVDSy1USU1FUlMgaXMgbm9uLW5pbCwgdGltZXJzIHRoYXQgYXJl IHJlYWR5IHRvIHJ1biB3aWxsIGRvIHNvLiAgKi8pCiAgIChMaXNwX09iamVjdCBjaGVja190aW1l cnMpCiB7Ci0gIGlmIChDT05TUCAoVnVucmVhZF9jb21tYW5kX2V2ZW50cykKLSAgICAgIHx8ICFO SUxQIChWdW5yZWFkX3Bvc3RfaW5wdXRfbWV0aG9kX2V2ZW50cykKLSAgICAgIHx8ICFOSUxQIChW dW5yZWFkX2lucHV0X21ldGhvZF9ldmVudHMpKQorICBpZiAocmVxdWV1ZWRfZXZlbnRzX3BlbmRp bmdfcCAoKSkKICAgICByZXR1cm4gKFF0KTsKIAogICAvKiBQcm9jZXNzIG5vbi11c2VyLXZpc2li bGUgZXZlbnRzIChCdWcjMTAxOTUpLiAgKi8KLS0gCjIuNDMuMAoK --=-PUaU02Ozv+LlZk/Klo3Z Content-Disposition: attachment; filename="0003-Fix-1-leaking-from-C-to-lisp-in-read-event-etc.patch" Content-Type: text/x-patch; name="0003-Fix-1-leaking-from-C-to-lisp-in-read-event-etc.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAyN2RiMDYyNWU1MzQ4ZDUwYmM1OTY3NGMwYThjOGQ0NWVkNGRiODc0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW0gUnVmZmluZyA8Y3J5cHRvQHRpbXJ1ZmZpbmcuZGU+CkRh dGU6IFdlZCwgMjcgRGVjIDIwMjMgMTQ6MzI6MDkgKzAxMDAKU3ViamVjdDogW1BBVENIIDMvNF0g Rml4IC0xIGxlYWtpbmcgZnJvbSBDIHRvIGxpc3AgaW4gJ3JlYWQtZXZlbnQnIGV0Yy4KClRoaXMg Zml4ZXMgYSBidWcgdGhhdCBjb3VsZCBtYWtlICdyZWFkLWV2ZW50JywgJ3JlYWQtY2hhcicsIGFu ZAoncmVhZC1jaGFyLWV4Y2x1c2l2ZScgZXJyb25lb3VzbHkgcmV0dXJuIC0xLCBhbiBpbnRlcm5h bCBtYWdpYyByZXR1cm4KdmFsdWUgb2YgJ3JlYWRfY2hhcicgbGVha2VkIGZyb20gQyB0byBsaXNw LgoqIHNyYy9rZXlib2FyZC5jIChyZWFkX2NoYXIsIHJlYWRfa2V5X3NlcXVlbmNlKTogTW92ZSBo YW5kbGluZwpvZiB0aGUgZW5kIG9mIGEga2V5Ym9hcmQgbWFjcm8gZnJvbSAncmVhZF9jaGFyJyB0 byBpdHMgY2FsbGVyCidyZWFkX2tleV9zZXF1ZW5jZScsIHdoaWNoIGlzIHRoZSBvbmx5IGNhbGxl ciB0aGF0IGNhbgptZWFuaW5nZnVsbHkgZGVhbCB3aXRoIHRoaXMgY2FzZS4KLS0tCiBzcmMva2V5 Ym9hcmQuYyB8IDM5ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL3NyYy9rZXlib2FyZC5jIGIvc3JjL2tleWJvYXJkLmMKaW5kZXggMDQxYjYxNmQ5YWEuLjli NWUwMjAyMzhjIDEwMDY0NAotLS0gYS9zcmMva2V5Ym9hcmQuYworKysgYi9zcmMva2V5Ym9hcmQu YwpAQCAtMjYxMCw3ICsyNjEwLDggQEAgcmVhZF9jaGFyIChpbnQgY29tbWFuZGZsYWcsIExpc3Bf T2JqZWN0IG1hcCwKICAgICAgIGdvdG8gcmVyZWFkX2Zvcl9pbnB1dF9tZXRob2Q7CiAgICAgfQog Ci0gIGlmICghTklMUCAoVmV4ZWN1dGluZ19rYmRfbWFjcm8pKQorICAvKiBJZiB3ZSdyZSBleGVj dXRpbmcgYSBtYWNybywgcHJvY2VzcyBpdCB1bmxlc3Mgd2UgYXJlIGF0IGl0cyBlbmQuICovCisg IGlmICghTklMUCAoVmV4ZWN1dGluZ19rYmRfbWFjcm8pICYmICFhdF9lbmRfb2ZfbWFjcm9fcCAo KSkKICAgICB7CiAgICAgICAvKiBXZSBzZXQgdGhpcyB0byBRbWFjcm87IHNpbmNlIHRoYXQncyBu b3QgYSBmcmFtZSwgbm9ib2R5IHdpbGwKIAkgdHJ5IHRvIHN3aXRjaCBmcmFtZXMgb24gdXMsIGFu ZCB0aGUgc2VsZWN0ZWQgd2luZG93IHdpbGwKQEAgLTI2MjQsMTUgKzI2MjUsNiBAQCByZWFkX2No YXIgKGludCBjb21tYW5kZmxhZywgTGlzcF9PYmplY3QgbWFwLAogCSBzZWxlY3RlZC4gICovCiAg ICAgICBWbGFzdF9ldmVudF9mcmFtZSA9IGludGVybmFsX2xhc3RfZXZlbnRfZnJhbWUgPSBRbWFj cm87CiAKLSAgICAgIC8qIEV4aXQgdGhlIG1hY3JvIGlmIHdlIGFyZSBhdCB0aGUgZW5kLgotCSBB bHNvLCBzb21lIHRoaW5ncyByZXBsYWNlIHRoZSBtYWNybyB3aXRoIHQKLQkgdG8gZm9yY2UgYW4g ZWFybHkgZXhpdC4gICovCi0gICAgICBpZiAoYXRfZW5kX29mX21hY3JvX3AgKCkpCi0JewotCSAg WFNFVElOVCAoYywgLTEpOwotCSAgZ290byBleGl0OwotCX0KLQogICAgICAgYyA9IEZhcmVmIChW ZXhlY3V0aW5nX2tiZF9tYWNybywgbWFrZV9pbnQgKGV4ZWN1dGluZ19rYmRfbWFjcm9faW5kZXgp KTsKICAgICAgIGlmIChTVFJJTkdQIChWZXhlY3V0aW5nX2tiZF9tYWNybykKIAkgICYmIChYRklY TkFUIChjKSAmIDB4ODApICYmIChYRklYTkFUIChjKSA8PSAweGZmKSkKQEAgLTEwNjg0LDggKzEw Njc2LDE5IEBAIHJlYWRfa2V5X3NlcXVlbmNlIChMaXNwX09iamVjdCAqa2V5YnVmLCBMaXNwX09i amVjdCBwcm9tcHQsCiAJICAgIH0KIAkgIHVzZWRfbW91c2VfbWVudSA9IHVzZWRfbW91c2VfbWVu dV9oaXN0b3J5W3RdOwogCX0KLQotICAgICAgLyogSWYgbm90LCB3ZSBzaG91bGQgYWN0dWFsbHkg cmVhZCBhIGNoYXJhY3Rlci4gICovCisgICAgICAvKiBJZiB3ZSdyZSBhdCB0aGUgZW5kIG9mIGEg bWFjcm8sIGV4aXQgaXQgYnkgcmV0dXJuaW5nIDAsCisJIHVubGVzcyB0aGVyZSBhcmUgdW5yZWFk IGV2ZW50cyBwZW5kaW5nLiAgKi8KKyAgICAgIGVsc2UgaWYgKCFOSUxQIChWZXhlY3V0aW5nX2ti ZF9tYWNybykKKwkgICYmIGF0X2VuZF9vZl9tYWNyb19wICgpCisJICAmJiAhcmVxdWV1ZWRfZXZl bnRzX3BlbmRpbmdfcCAoKSkKKwl7CisJICB0ID0gMDsKKwkgIC8qIFRoZSBNaWNyb3NvZnQgQyBj b21waWxlciBjYW4ndCBoYW5kbGUgdGhlIGdvdG8gdGhhdAorCSAgICAgd291bGQgZ28gaGVyZS4g ICovCisJICBkdW1teWZsYWcgPSB0cnVlOworCSAgYnJlYWs7CisJfQorICAgICAgLyogT3RoZXJ3 aXNlLCB3ZSBzaG91bGQgYWN0dWFsbHkgcmVhZCBhIGNoYXJhY3Rlci4gICovCiAgICAgICBlbHNl CiAJewogCSAgewpAQCAtMTA3NzcsMTggKzEwNzgwLDYgQEAgcmVhZF9rZXlfc2VxdWVuY2UgKExp c3BfT2JqZWN0ICprZXlidWYsIExpc3BfT2JqZWN0IHByb21wdCwKIAkgICAgICByZXR1cm4gLTE7 CiAJICAgIH0KIAotCSAgLyogcmVhZF9jaGFyIHJldHVybnMgLTEgYXQgdGhlIGVuZCBvZiBhIG1h Y3JvLgotCSAgICAgRW1hY3MgMTggaGFuZGxlcyB0aGlzIGJ5IHJldHVybmluZyBpbW1lZGlhdGVs eSB3aXRoIGEKLQkgICAgIHplcm8sIHNvIHRoYXQncyB3aGF0IHdlJ2xsIGRvLiAgKi8KLQkgIGlm IChGSVhOVU1QIChrZXkpICYmIFhGSVhOVU0gKGtleSkgPT0gLTEpCi0JICAgIHsKLQkgICAgICB0 ID0gMDsKLQkgICAgICAvKiBUaGUgTWljcm9zb2Z0IEMgY29tcGlsZXIgY2FuJ3QgaGFuZGxlIHRo ZSBnb3RvIHRoYXQKLQkJIHdvdWxkIGdvIGhlcmUuICAqLwotCSAgICAgIGR1bW15ZmxhZyA9IHRy dWU7Ci0JICAgICAgYnJlYWs7Ci0JICAgIH0KLQogCSAgLyogSWYgdGhlIGN1cnJlbnQgYnVmZmVy IGhhcyBiZWVuIGNoYW5nZWQgZnJvbSB1bmRlciB1cywgdGhlCiAJICAgICBrZXltYXAgbWF5IGhh dmUgY2hhbmdlZCwgc28gcmVwbGF5IHRoZSBzZXF1ZW5jZS4gICovCiAJICBpZiAoQlVGRkVSUCAo a2V5KSkKLS0gCjIuNDMuMAoK --=-PUaU02Ozv+LlZk/Klo3Z Content-Disposition: attachment; filename="0004-Remove-workarounds-for-solved-read-event-bug.patch" Content-Type: text/x-patch; name="0004-Remove-workarounds-for-solved-read-event-bug.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSBlNzNlMDg5Mjc3OTIzMDMwMTNhOGE5OTM1NjU2MzY1ZjlmMjI5OWI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW0gUnVmZmluZyA8Y3J5cHRvQHRpbXJ1ZmZpbmcuZGU+CkRh dGU6IFdlZCwgMjcgRGVjIDIwMjMgMTQ6MzI6MDkgKzAxMDAKU3ViamVjdDogW1BBVENIIDQvNF0g UmVtb3ZlIHdvcmthcm91bmRzIGZvciBzb2x2ZWQgJ3JlYWQtZXZlbnQnIGJ1ZwoKKiBsaXNwL3N1 YnIuZWwgKHJlYWQtY2hhci1jaG9pY2Utd2l0aC1yZWFkLWtleSk6CiogbGlzcC9uZXQvZGJ1cy5l bCAoZGJ1cy1jYWxsLW1ldGhvZCk6CiogbGlzcC9jYWxjL2NhbGMtcHJvZy5lbDoKUmVtb3ZlIHdv cmthcm91bmRzIGZvciB0aGUgYnVnIGZpeGVkIGluIHRoZSBwcmV2aW91cyBjb21taXQKYWM4MmJh ZWExYzQxZWM5NzRhZDQ5ZjI4NjFhZTZjMDZiZGEyYjRlZCwgd2hlcmUgJ3JlYWQtZXZlbnQnLAon cmVhZC1jaGFyJyBhbmQgJ3JlYWQtY2hhci1leGNsdXNpdmVseScgY291bGQgcmV0dXJuIHdyb25n bHkgLTEuCkluIHRoZSBjYXNlIG9mIGxpc3AvZGJ1cy5lbCwgdGhpcyByZXZlcnRzIGNvbW1pdAo3 MTc3MzkzODI2YzczYzg3ZmZlOWI0MjhmMGU1ZWRhZTI0NGQ3YTk4LgotLS0KIGxpc3AvY2FsYy9j YWxjLXByb2cuZWwgfCA2IC0tLS0tLQogbGlzcC9uZXQvZGJ1cy5lbCAgICAgICB8IDYgKy0tLS0t CiBsaXNwL3N1YnIuZWwgICAgICAgICAgIHwgNSAtLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxIGlu c2VydGlvbigrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9jYWxjL2NhbGMt cHJvZy5lbCBiL2xpc3AvY2FsYy9jYWxjLXByb2cuZWwKaW5kZXggMDMyMTA5OTVlYjMuLjE3N2Mx Nzk0MzNkIDEwMDY0NAotLS0gYS9saXNwL2NhbGMvY2FsYy1wcm9nLmVsCisrKyBiL2xpc3AvY2Fs Yy9jYWxjLXByb2cuZWwKQEAgLTEyMzAsOCArMTIzMCw2IEBAIGNhbGMta2JkLXNraXAtdG8tZWxz ZS1pZgogCWNoKQogICAgICh3aGlsZSAoPj0gY291bnQgMCkKICAgICAgIChzZXRxIGNoIChyZWFk LWNoYXIpKQotICAgICAgKGlmICg9IGNoIC0xKQotCSAgKGVycm9yICJVbnRlcm1pbmF0ZWQgWlsg aW4ga2V5Ym9hcmQgbWFjcm8iKSkKICAgICAgIChpZiAoPSBjaCA/WikKIAkgIChwcm9nbgogCSAg ICAoc2V0cSBjaCAocmVhZC1jaGFyKSkKQEAgLTEzMDAsOCArMTI5OCw2IEBAIGNhbGMta2JkLWxv b3AKIAkobWVzc2FnZSAiUmVhZGluZyBsb29wIGJvZHkuLi4iKSkKICAgICAod2hpbGUgKD49IGNv dW50IDApCiAgICAgICAoc2V0cSBjaCAocmVhZC1ldmVudCkpCi0gICAgICAoaWYgKGVxIGNoIC0x KQotCSAgKGVycm9yICJVbnRlcm1pbmF0ZWQgWiVjIGluIGtleWJvYXJkIG1hY3JvIiBvcGVuKSkK ICAgICAgIChpZiAoZXEgY2ggP1opCiAJICAocHJvZ24KIAkgICAgKHNldHEgY2ggKHJlYWQtZXZl bnQpCkBAIC0xNDI4LDggKzE0MjQsNiBAQCBjYWxjLWtiZC1wdXNoCiAJICAgICAgIChtZXNzYWdl ICJSZWFkaW5nIGJvZHkuLi4iKSkKIAkgICAod2hpbGUgKD49IGNvdW50IDApCiAJICAgICAoc2V0 cSBjaCAocmVhZC1jaGFyKSkKLQkgICAgIChpZiAoPSBjaCAtMSkKLQkJIChlcnJvciAiVW50ZXJt aW5hdGVkIFpgIGluIGtleWJvYXJkIG1hY3JvIikpCiAJICAgICAoaWYgKD0gY2ggP1opCiAJCSAo cHJvZ24KIAkJICAgKHNldHEgY2ggKHJlYWQtY2hhcikKZGlmZiAtLWdpdCBhL2xpc3AvbmV0L2Ri dXMuZWwgYi9saXNwL25ldC9kYnVzLmVsCmluZGV4IDc3YjMzNGU3MDRlLi40NmY4NWRhYmEyNCAx MDA2NDQKLS0tIGEvbGlzcC9uZXQvZGJ1cy5lbAorKysgYi9saXNwL25ldC9kYnVzLmVsCkBAIC0z NzEsMTEgKzM3MSw3IEBAIGRidXMtY2FsbC1tZXRob2QKIAkgKGFwcGx5CiAgICAgICAgICAgIydk YnVzLW1lc3NhZ2UtaW50ZXJuYWwgZGJ1cy1tZXNzYWdlLXR5cGUtbWV0aG9kLWNhbGwKICAgICAg ICAgICBidXMgc2VydmljZSBwYXRoIGludGVyZmFjZSBtZXRob2QgIydkYnVzLWNhbGwtbWV0aG9k LWhhbmRsZXIgYXJncykpCi0gICAgICAgIChyZXN1bHQgKHVubGVzcyBleGVjdXRpbmcta2JkLW1h Y3JvIChjb25zIDpwZW5kaW5nIG5pbCkpKSkKLQotICAgIDs7IFdoaWxlIGV4ZWN1dGluZyBhIGtl eWJvYXJkIG1hY3JvLCB3ZSBydW4gaW50byBhbiBpbmZpbml0ZSBsb29wLAotICAgIDs7IHJlY2Vp dmluZyB0aGUgZXZlbnQgLTEuICBTbyB3ZSBkb24ndCB0cnkgdG8gZ2V0IHRoZSByZXN1bHQuCi0g ICAgOzsgKEJ1ZyM2MjAxOCkKKyAgICAgICAgKHJlc3VsdCAoY29ucyA6cGVuZGluZyBuaWwpKSkK IAogICAgIDs7IFdhaXQgdW50aWwgYGRidXMtY2FsbC1tZXRob2QtaGFuZGxlcicgaGFzIHB1dCB0 aGUgcmVzdWx0IGludG8KICAgICA7OyBgZGJ1cy1yZXR1cm4tdmFsdWVzLXRhYmxlJy4gIElmIG5v IHRpbWVvdXQgaXMgZ2l2ZW4sIHVzZSB0aGUKZGlmZiAtLWdpdCBhL2xpc3Avc3Vici5lbCBiL2xp c3Avc3Vici5lbAppbmRleCBkZjI4OTg5YjM5OS4uNzhlN2ZmYmM5NzkgMTAwNjQ0Ci0tLSBhL2xp c3Avc3Vici5lbAorKysgYi9saXNwL3N1YnIuZWwKQEAgLTM1MzksMTEgKzM1MzksNiBAQCByZWFk LWNoYXItY2hvaWNlLXdpdGgtcmVhZC1rZXkKIAkJIChoZWxwLWZvcm0tc2hvdykpKQogCSAgICgo bWVtcSBjaGFyIGNoYXJzKQogCSAgICAoc2V0cSBkb25lIHQpKQotCSAgICgoYW5kIGV4ZWN1dGlu Zy1rYmQtbWFjcm8gKD0gY2hhciAtMSkpCi0JICAgIDs7IHJlYWQtZXZlbnQgcmV0dXJucyAtMSBp ZiB3ZSBhcmUgaW4gYSBrYmQgbWFjcm8gYW5kCi0JICAgIDs7IHRoZXJlIGFyZSBubyBtb3JlIGV2 ZW50cyBpbiB0aGUgbWFjcm8uICBBdHRlbXB0IHRvCi0JICAgIDs7IGdldCBhbiBldmVudCBpbnRl cmFjdGl2ZWx5LgotCSAgICAoc2V0cSBleGVjdXRpbmcta2JkLW1hY3JvIG5pbCkpCiAJICAgKChu b3QgaW5oaWJpdC1rZXlib2FyZC1xdWl0KQogCSAgICAoY29uZAogCSAgICAgKChhbmQgKG51bGwg ZXNjLWZsYWcpIChlcSBjaGFyID9cZSkpCi0tIAoyLjQzLjAKCg== --=-PUaU02Ozv+LlZk/Klo3Z--