From mboxrd@z Thu Jan  1 00:00:00 1970
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
From: Kalev Lember <klember@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/glib2] cve-2026-58016-f44: Backport upstream patch to fix GKeyFile group comments (rhbz#2225257)
Date: Tue, 11 Aug 2026 10:38:00 GMT
Message-ID: <178644468035.1.128458195689952563.rpms-glib2-741aababcffd@fedoraproject.org>
List-ID: <git-commits.fedoraproject.org>
X-Git-Repo: rpms/glib2
X-Git-Branch: cve-2026-58016-f44
X-Git-Rev: 741aababcffd73500c998fc2d49fec291a4e3aef

QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvZ2xpYjIKQnJhbmNo
IDogY3ZlLTIwMjYtNTgwMTYtZjQ0CkNvbW1pdCA6IDc0MWFhYmFiY2ZmZDczNTAwYzk5OGZjMmQ0
OWZlYzI5MWE0ZTNhZWYKQXV0aG9yIDogS2FsZXYgTGVtYmVyIDxrbGVtYmVyQHJlZGhhdC5jb20+
CkRhdGUgICA6IDIwMjMtMDctMjRUMjI6MjM6MDErMDI6MDAKU3RhdHMgIDogKzE2MS8tMCBpbiAy
IGZpbGUocykKVVJMICAgIDogaHR0cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvcnBtcy9nbGli
Mi9jLzc0MWFhYmFiY2ZmZDczNTAwYzk5OGZjMmQ0OWZlYzI5MWE0ZTNhZWY/YnJhbmNoPWN2ZS0y
MDI2LTU4MDE2LWY0NAoKTG9nOgpCYWNrcG9ydCB1cHN0cmVhbSBwYXRjaCB0byBmaXggR0tleUZp
bGUgZ3JvdXAgY29tbWVudHMgKHJoYnojMjIyNTI1NykKCi0tLQpkaWZmIC0tZ2l0IGEvMzQ5OC5w
YXRjaCBiLzM0OTgucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZGQy
NjI4NgotLS0gL2Rldi9udWxsCisrKyBiLzM0OTgucGF0Y2gKQEAgLTAsMCArMSwxNTggQEAKK0Zy
b20gYzQ5NTAyNTgyZmFlZGVjYzcwMjAxNTVkOTViMTZjN2ExZDc4ZDQzMiBNb24gU2VwIDE3IDAw
OjAwOjAwIDIwMDEKK0Zyb206ID0/VVRGLTg/cT9HYT1DMz1BQmw9MjBCb25pdGhvbj89IDxnYWVs
QHhmY2Uub3JnPgorRGF0ZTogVGh1LCAxMyBKdWwgMjAyMyAxMDowNjoyMSArMDIwMAorU3ViamVj
dDogW1BBVENIIDEvMl0gZ2tleWZpbGU6IEVuc3VyZSB3ZSBkb24ndCBhZGQgZXh0cmEgYmxhbmsg
bGluZSBhYm92ZSBuZXcKKyBncm91cAorCitBIGZvcmdvdHRlbiBlZGdlIGNhc2UgaW4gODZiNGIw
NDU6IHdoZW4gdGhlIGxhc3QgdmFsdWUgb2YgdGhlIGxhc3QgZ3JvdXAKK2hhcyBiZWVuIGFkZGVk
IHZpYSBnX2tleV9maWxlX3NldF92YWx1ZSgpIGFuZCBpdCBjb250YWlucyBsaW5lIGJyZWFrcy4K
K1RoZSBiZXN0IHdlIGNhbiBkbyBpbiB0aGlzIGNhc2UgaXMgcHJvYmFibHkgdG8gZG8gbm90aGlu
Zy4KKworQ2xvc2VzOiAjMzA0NworRml4ZXM6IDg2YjRiMDQ1M2VhM2E4MTQxNjdkNGE1ZjdhNDAz
MWQ0Njc1NDM3MTYKKy0tLQorIGdsaWIvZ2tleWZpbGUuYyAgICAgIHwgIDYgKysrKystCisgZ2xp
Yi90ZXN0cy9rZXlmaWxlLmMgfCAxMCArKysrKysrKysrCisgMiBmaWxlcyBjaGFuZ2VkLCAxNSBp
bnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCisKK2RpZmYgLS1naXQgYS9nbGliL2drZXlmaWxl
LmMgYi9nbGliL2drZXlmaWxlLmMKK2luZGV4IDE0NTEzNjcwNmYuLjBlMjFhYjRmMTQgMTAwNjQ0
CistLS0gYS9nbGliL2drZXlmaWxlLmMKKysrKyBiL2dsaWIvZ2tleWZpbGUuYworQEAgLTM4NTgs
OCArMzg1OCwxMiBAQCBnX2tleV9maWxlX2FkZF9ncm91cCAoR0tleUZpbGUgICAgKmtleV9maWxl
LAorICAgICB7CisgICAgICAgLyogc2VwYXJhdGUgZ3JvdXBzIGJ5IGEgYmxhbmsgbGluZSBpZiB3
ZSBkb24ndCBrZWVwIGNvbW1lbnRzIG9yIGdyb3VwIGlzIGNyZWF0ZWQgKi8KKyAgICAgICBHS2V5
RmlsZUdyb3VwICpuZXh0X2dyb3VwID0ga2V5X2ZpbGUtPmdyb3Vwcy0+bmV4dC0+ZGF0YTsKKysg
ICAgICBHS2V5RmlsZUtleVZhbHVlUGFpciAqcGFpcjsKKysgICAgICBpZiAobmV4dF9ncm91cC0+
a2V5X3ZhbHVlX3BhaXJzICE9IE5VTEwpCisrICAgICAgICBwYWlyID0gbmV4dF9ncm91cC0+a2V5
X3ZhbHVlX3BhaXJzLT5kYXRhOworKworICAgICAgIGlmIChuZXh0X2dyb3VwLT5rZXlfdmFsdWVf
cGFpcnMgPT0gTlVMTCB8fAorLSAgICAgICAgICAoKEdLZXlGaWxlS2V5VmFsdWVQYWlyICopIG5l
eHRfZ3JvdXAtPmtleV92YWx1ZV9wYWlycy0+ZGF0YSktPmtleSAhPSBOVUxMKQorKyAgICAgICAg
ICAocGFpci0+a2V5ICE9IE5VTEwgJiYgIWdfc3Ryc3RyX2xlbiAocGFpci0+dmFsdWUsIC0xLCAi
XG4iKSkpCisgICAgICAgICB7CisgICAgICAgICAgIEdLZXlGaWxlS2V5VmFsdWVQYWlyICpwYWly
ID0gZ19uZXcgKEdLZXlGaWxlS2V5VmFsdWVQYWlyLCAxKTsKKyAgICAgICAgICAgcGFpci0+a2V5
ID0gTlVMTDsKK2RpZmYgLS1naXQgYS9nbGliL3Rlc3RzL2tleWZpbGUuYyBiL2dsaWIvdGVzdHMv
a2V5ZmlsZS5jCitpbmRleCBkM2VlZDI5ODQxLi44MGNkYzkzZDhmIDEwMDY0NAorLS0tIGEvZ2xp
Yi90ZXN0cy9rZXlmaWxlLmMKKysrKyBiL2dsaWIvdGVzdHMva2V5ZmlsZS5jCitAQCAtNDgwLDYg
KzQ4MCwxNiBAQCB0ZXN0X2NvbW1lbnRzICh2b2lkKQorICAgICAgICAgICAgICAgIEdfS0VZX0ZJ
TEVfRVJST1JfR1JPVVBfTk9UX0ZPVU5EKTsKKyAgIGdfYXNzZXJ0X251bGwgKGNvbW1lbnQpOwor
IAorKyAgZ190ZXN0X2J1ZyAoImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbGliLy0v
aXNzdWVzLzMwNDciKTsKKysKKysgIC8qIGNoZWNrIGlmIHdlIGRvbid0IGFkZCBhIGJsYW5rIGxp
bmUgYWJvdmUgbmV3IGdyb3VwIGlmIGxhc3QgdmFsdWUgb2YgcHJlY2VkaW5nCisrICAgKiBncm91
cCB3YXMgYWRkZWQgdmlhIGdfa2V5X2ZpbGVfc2V0X3ZhbHVlKCkgYW5kIGNvbnRhaW5zIGxpbmUg
YnJlYWtzICovCisrICBnX2tleV9maWxlX3NldF92YWx1ZSAoa2V5ZmlsZSwgImdyb3VwNCIsICJr
ZXkxIiwgInZhbHVlMVxuXG4jIGdyb3VwIGNvbW1lbnQiKTsKKysgIGdfa2V5X2ZpbGVfc2V0X3N0
cmluZyAoa2V5ZmlsZSwgImdyb3VwNSIsICJrZXkxIiwgInZhbHVlMSIpOworKyAgY29tbWVudCA9
IGdfa2V5X2ZpbGVfZ2V0X2NvbW1lbnQgKGtleWZpbGUsICJncm91cDUiLCBOVUxMLCAmZXJyb3Ip
OworKyAgY2hlY2tfbm9fZXJyb3IgKCZlcnJvcik7CisrICBnX2Fzc2VydF9udWxsIChjb21tZW50
KTsKKysKKyAgIGdfa2V5X2ZpbGVfZnJlZSAoa2V5ZmlsZSk7CisgfQorIAorLS0gCitHaXRMYWIK
KworCitGcm9tIDUxZGZiM2MyMjljMDQ3OGIzNjE1ZjQ4NmZiYmMzNmRlMjU4NmJkNTIgTW9uIFNl
cCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiA9P1VURi04P3E/R2E9QzM9QUJsPTIwQm9uaXRob24/
PSA8Z2FlbEB4ZmNlLm9yZz4KK0RhdGU6IFRodSwgMTMgSnVsIDIwMjMgMTA6MTk6MDQgKzAyMDAK
K1N1YmplY3Q6IFtQQVRDSCAyLzJdIGdrZXlmaWxlOiBTa2lwIGdyb3VwIGNvbW1lbnQgd2hlbiBh
ZGRpbmcgYSBuZXcga2V5IHRvIGEKKyBncm91cAorCitBbiBvdmVyc2lnaHQgaW4gODZiNGIwNDU6
IHNpbmNlIHRoZSBjb21tZW50IG9mIGdyb3VwIE4gbm93IGNvbnNpc3RzIG9mCit0aGUgbGFzdCBu
dWxsLWtleSB2YWx1ZXMgb2YgZ3JvdXAgTi0xLCB0aGVzZSBrZXlzIG11c3Qgb2J2aW91c2x5IGJl
Citza2lwcGVkIHdoZW4gYWRkaW5nIGEgbmV3IG5vbi1udWxsIGtleSB0byBncm91cCBOLTEuCisK
K0Nsb3NlczogIzMwNDcKK0ZpeGVzOiA4NmI0YjA0NTNlYTNhODE0MTY3ZDRhNWY3YTQwMzFkNDY3
NTQzNzE2CistLS0KKyBnbGliL2drZXlmaWxlLmMgICAgICB8IDE5ICsrKysrKysrKysrKysrLS0t
LS0KKyBnbGliL3Rlc3RzL2tleWZpbGUuYyB8ICA5ICsrKysrKysrKworIDIgZmlsZXMgY2hhbmdl
ZCwgMjMgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL2dsaWIv
Z2tleWZpbGUuYyBiL2dsaWIvZ2tleWZpbGUuYworaW5kZXggMGUyMWFiNGYxNC4uNDc1OTA1MTk3
NyAxMDA2NDQKKy0tLSBhL2dsaWIvZ2tleWZpbGUuYworKysrIGIvZ2xpYi9na2V5ZmlsZS5jCitA
QCAtNTczLDcgKzU3Myw4IEBAIHN0YXRpYyB2b2lkICAgICAgICAgICAgICAgICAgZ19rZXlfZmls
ZV9yZW1vdmVfa2V5X3ZhbHVlX3BhaXJfbm9kZSAoR0tleUZpbGUKKyAKKyBzdGF0aWMgdm9pZCAg
ICAgICAgICAgICAgICAgIGdfa2V5X2ZpbGVfYWRkX2tleV92YWx1ZV9wYWlyICAgICAoR0tleUZp
bGUgICAgICAgICAgICAgICAqa2V5X2ZpbGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdLZXlGaWxlR3JvdXAgICAgICAg
ICAgKmdyb3VwLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICBHS2V5RmlsZUtleVZhbHVlUGFpciAgICpwYWlyKTsKKysgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgR0tleUZpbGVLZXlWYWx1ZVBhaXIgICAqcGFpciwKKysgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xpc3QgICAgICAgICAg
ICAgICAgICAqc2libGluZyk7Cisgc3RhdGljIHZvaWQgICAgICAgICAgICAgICAgICBnX2tleV9m
aWxlX2FkZF9rZXkgICAgICAgICAgICAgICAgKEdLZXlGaWxlICAgICAgICAgICAgICAgKmtleV9m
aWxlLAorIAkJCQkJCQkJR0tleUZpbGVHcm91cCAgICAgICAgICAqZ3JvdXAsCisgCQkJCQkJCQlj
b25zdCBnY2hhciAgICAgICAgICAgICprZXksCitAQCAtMTQ0Nyw3ICsxNDQ4LDggQEAgZ19rZXlf
ZmlsZV9wYXJzZV9rZXlfdmFsdWVfcGFpciAoR0tleUZpbGUgICAgICprZXlfZmlsZSwKKyAgICAg
ICBwYWlyLT5rZXkgPSBnX3N0ZWFsX3BvaW50ZXIgKCZrZXkpOworICAgICAgIHBhaXItPnZhbHVl
ID0gZ19zdHJuZHVwICh2YWx1ZV9zdGFydCwgdmFsdWVfbGVuKTsKKyAKKy0gICAgICBnX2tleV9m
aWxlX2FkZF9rZXlfdmFsdWVfcGFpciAoa2V5X2ZpbGUsIGtleV9maWxlLT5jdXJyZW50X2dyb3Vw
LCBwYWlyKTsKKysgICAgICBnX2tleV9maWxlX2FkZF9rZXlfdmFsdWVfcGFpciAoa2V5X2ZpbGUs
IGtleV9maWxlLT5jdXJyZW50X2dyb3VwLCBwYWlyLAorKyAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICBrZXlfZmlsZS0+Y3VycmVudF9ncm91cC0+a2V5X3ZhbHVlX3BhaXJzKTsK
KyAgICAgfQorIAorICAgZ19mcmVlIChrZXkpOworQEAgLTQwMzQsMTAgKzQwMzYsMTEgQEAgZ19r
ZXlfZmlsZV9yZW1vdmVfZ3JvdXAgKEdLZXlGaWxlICAgICAqa2V5X2ZpbGUsCisgc3RhdGljIHZv
aWQKKyBnX2tleV9maWxlX2FkZF9rZXlfdmFsdWVfcGFpciAoR0tleUZpbGUgICAgICAgICAgICAg
KmtleV9maWxlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHS2V5RmlsZUdyb3Vw
ICAgICAgICAqZ3JvdXAsCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdLZXlGaWxl
S2V5VmFsdWVQYWlyICpwYWlyKQorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHS2V5
RmlsZUtleVZhbHVlUGFpciAqcGFpciwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
R0xpc3QgICAgICAgICAgICAgICAgKnNpYmxpbmcpCisgeworICAgZ19oYXNoX3RhYmxlX3JlcGxh
Y2UgKGdyb3VwLT5sb29rdXBfbWFwLCBwYWlyLT5rZXksIHBhaXIpOworLSAgZ3JvdXAtPmtleV92
YWx1ZV9wYWlycyA9IGdfbGlzdF9wcmVwZW5kIChncm91cC0+a2V5X3ZhbHVlX3BhaXJzLCBwYWly
KTsKKysgIGdyb3VwLT5rZXlfdmFsdWVfcGFpcnMgPSBnX2xpc3RfaW5zZXJ0X2JlZm9yZSAoZ3Jv
dXAtPmtleV92YWx1ZV9wYWlycywgc2libGluZywgcGFpcik7CisgfQorIAorIHN0YXRpYyB2b2lk
CitAQCAtNDA0NywxMiArNDA1MCwxOCBAQCBnX2tleV9maWxlX2FkZF9rZXkgKEdLZXlGaWxlICAg
ICAgKmtleV9maWxlLAorIAkJICAgIGNvbnN0IGdjaGFyICAgKnZhbHVlKQorIHsKKyAgIEdLZXlG
aWxlS2V5VmFsdWVQYWlyICpwYWlyOworKyAgR0xpc3QgKmxwOworIAorICAgcGFpciA9IGdfbmV3
IChHS2V5RmlsZUtleVZhbHVlUGFpciwgMSk7CisgICBwYWlyLT5rZXkgPSBnX3N0cmR1cCAoa2V5
KTsKKyAgIHBhaXItPnZhbHVlID0gZ19zdHJkdXAgKHZhbHVlKTsKKyAKKy0gIGdfa2V5X2ZpbGVf
YWRkX2tleV92YWx1ZV9wYWlyIChrZXlfZmlsZSwgZ3JvdXAsIHBhaXIpOworKyAgLyogc2tpcCBn
cm91cCBjb21tZW50ICovCisrICBscCA9IGdyb3VwLT5rZXlfdmFsdWVfcGFpcnM7CisrICB3aGls
ZSAobHAgIT0gTlVMTCAmJiAoKEdLZXlGaWxlS2V5VmFsdWVQYWlyICopIGxwLT5kYXRhKS0+a2V5
ID09IE5VTEwpCisrICAgIGxwID0gbHAtPm5leHQ7CisrCisrICBnX2tleV9maWxlX2FkZF9rZXlf
dmFsdWVfcGFpciAoa2V5X2ZpbGUsIGdyb3VwLCBwYWlyLCBscCk7CisgfQorIAorIC8qKgorZGlm
ZiAtLWdpdCBhL2dsaWIvdGVzdHMva2V5ZmlsZS5jIGIvZ2xpYi90ZXN0cy9rZXlmaWxlLmMKK2lu
ZGV4IDgwY2RjOTNkOGYuLjJjOGVjYTRlYmMgMTAwNjQ0CistLS0gYS9nbGliL3Rlc3RzL2tleWZp
bGUuYworKysrIGIvZ2xpYi90ZXN0cy9rZXlmaWxlLmMKK0BAIC00NTYsNiArNDU2LDE1IEBAIHRl
c3RfY29tbWVudHMgKHZvaWQpCisgICBjaGVja19uYW1lICgiZ3JvdXAgY29tbWVudCIsIGNvbW1l
bnQsIGdyb3VwX2NvbW1lbnQsIDApOworICAgZ19mcmVlIChjb21tZW50KTsKKyAKKysgIGdfdGVz
dF9idWcgKCJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ2xpYi8tL2lzc3Vlcy8zMDQ3
Iik7CisrCisrICAvKiBjaGVjayBpZiBhZGRpbmcgYSBrZXkgdG8gZ3JvdXAgTiBwcmVzZXJ2ZSBn
cm91cCBjb21tZW50IG9mIGdyb3VwIE4rMSAqLworKyAgZ19rZXlfZmlsZV9zZXRfc3RyaW5nIChr
ZXlmaWxlLCAiZ3JvdXAxIiwgImtleTUiLCAidmFsdWU1Iik7CisrICBjb21tZW50ID0gZ19rZXlf
ZmlsZV9nZXRfY29tbWVudCAoa2V5ZmlsZSwgImdyb3VwMiIsIE5VTEwsICZlcnJvcik7CisrICBj
aGVja19ub19lcnJvciAoJmVycm9yKTsKKysgIGNoZWNrX25hbWUgKCJncm91cCBjb21tZW50Iiwg
Y29tbWVudCwgZ3JvdXBfY29tbWVudCwgMCk7CisrICBnX2ZyZWUgKGNvbW1lbnQpOworKworICAg
Z190ZXN0X2J1ZyAoImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbGliLy0vaXNzdWVz
LzEwNCIpOworIAorICAgLyogY2hlY2sgaWYgY29tbWVudHMgYWJvdmUgYW5vdGhlciBncm91cCB0
aGFuIHRoZSBmaXJzdCBvbmUgYXJlIHByb3Blcmx5IHJlbW92ZWQgKi8KKy0tIAorR2l0TGFiCisK
CmRpZmYgLS1naXQgYS9nbGliMi5zcGVjIGIvZ2xpYjIuc3BlYwppbmRleCBhNzcxNDE5Li45ZjYz
ZWYyIDEwMDY0NAotLS0gYS9nbGliMi5zcGVjCisrKyBiL2dsaWIyLnNwZWMKQEAgLTIzLDYgKzIz
LDkgQEAgUGF0Y2gyOiBnc3Bhd24tZXBlcm0ucGF0Y2gKICMgaHR0cHM6Ly9naXRsYWIuZ25vbWUu
b3JnL0dOT01FL2dsaWIvLS9tZXJnZV9yZXF1ZXN0cy8zNTA0CiBQYXRjaDM6IGZpeC1taXNzaW5n
LWV4cG9ydGVkLXN5bWJvbHMucGF0Y2gKIAorIyBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05P
TUUvZ2xpYi8tL21lcmdlX3JlcXVlc3RzLzM0OTgKK1BhdGNoNDogMzQ5OC5wYXRjaAorCiBCdWls
ZFJlcXVpcmVzOiBnY2MKIEJ1aWxkUmVxdWlyZXM6IGdjYy1jKysKIEJ1aWxkUmVxdWlyZXM6IGdl
dHRleHQK