NetBSD-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: lib/60995: libedit: allocate display rows on demand
The following reply was made to PR lib/60995; it has been noted by GNATS.
From: Hua Zhong <hzhong%gmail.com@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: lib-bug-people%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, netbsd-bugs%netbsd.org@localhost
Subject: Re: lib/60995: libedit: allocate display rows on demand
Date: Fri, 13 Nov 2026 11:30:35 -0800
--00000000000009c46006602d77a2
Content-Type: multipart/alternative; boundary="00000000000009c45d06602d77a0"
--00000000000009c45d06602d77a0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attached an updated patch that handles allocation failures. I had to add 14
checks of the new error flag in various places. Let me know what you think.
Alternatively, we could use the previous patch with exit() but provide an
API or CONFIG_DELAYED_DISPLAY_ALLOC option to enable the delayed allocation
so it is only an opt-in behavior.
On Thu, Nov 12, 2026 at 2:15=E2=80=AFPM Christos Zoulas via gnats <
gnats-admin%netbsd.org@localhost> wrote:
> The following reply was made to PR lib/60995; it has been noted by GNATS.
>
> From: Christos Zoulas <christos%zoulas.com@localhost>
> To: gnats-bugs%netbsd.org@localhost
> Cc: lib-bug-people%netbsd.org@localhost,
> gnats-admin%netbsd.org@localhost,
> netbsd-bugs%netbsd.org@localhost,
> hzhong%gmail.com@localhost
> Subject: Re: lib/60995: libedit: allocate display rows on demand
> Date: Thu, 12 Nov 2026 17:09:54 -0500
>
> >=3D20
> > If you think this is a good idea, I can spend more time working out a
> > solution, which will undoubtedly add more complexity. Honestly the
> > application is already cooked if they cannot allocate more memory at =
=3D
> this
> > point, and often it's easier to restart it then to keep running. But =
=3D
> if
> > that's what it takes to optimize the memory usage I can do it. The =3D
> memory
> > savings can be huge.
> >=3D20
>
> Yes, but it is not up to the library to abort or exit if it can't =3D
> allocate memory,
> specially one that might not be the primary function of the application =
=3D
> like
> command line editing. The application might have already allocated all
> the memory it needs to operate and just the editor part might be
> non-functional. The library does not abort() or exit() anywhere else
> now, (there are abort() calls from programming errors, not transient =3D
> ones).
>
> christos=3D
>
>
--00000000000009c45d06602d77a0
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
<div dir=3D"ltr">Attached an updated patch that handles allocation failures=
. I had to add 14 checks of the new error flag=C2=A0in various places. Let =
me know what you think.<div><br></div><div>Alternatively, we could use the =
previous patch with exit() but provide an API or CONFIG_DELAYED_DISPLAY_ALL=
OC option to enable the delayed allocation so it is only an opt-in behavior=
.</div></div><br><div class=3D"gmail_quote gmail_quote_container"><div dir=
=3D"ltr" class=3D"gmail_attr">On Thu, Nov 12, 2026 at 2:15=E2=80=AFPM Chris=
tos Zoulas via gnats <<a href=3D"mailto:gnats-admin%netbsd.org@localhost">gnats-ad=
min%netbsd.org@localhost</a>> wrote:<br></div><blockquote class=3D"gmail_quote" st=
yle=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padd=
ing-left:1ex">The following reply was made to PR lib/60995; it has been not=
ed by GNATS.<br>
<br>
From: Christos Zoulas <<a href=3D"mailto:christos%zoulas.com@localhost" target=3D"=
_blank">christos%zoulas.com@localhost</a>><br>
To: <a href=3D"mailto:gnats-bugs%netbsd.org@localhost" target=3D"_blank">gnats-bugs@n=
etbsd.org</a><br>
Cc: <a href=3D"mailto:lib-bug-people%netbsd.org@localhost" target=3D"_blank">lib-bug-=
people%netbsd.org@localhost</a>,<br>
=C2=A0<a href=3D"mailto:gnats-admin%netbsd.org@localhost" target=3D"_blank">gnats-adm=
in%netbsd.org@localhost</a>,<br>
=C2=A0<a href=3D"mailto:netbsd-bugs%netbsd.org@localhost" target=3D"_blank">netbsd-bu=
gs%netbsd.org@localhost</a>,<br>
=C2=A0<a href=3D"mailto:hzhong%gmail.com@localhost" target=3D"_blank">hzhong%gmail.co@localhost=
m</a><br>
Subject: Re: lib/60995: libedit: allocate display rows on demand<br>
Date: Thu, 12 Nov 2026 17:09:54 -0500<br>
<br>
=C2=A0>=3D20<br>
=C2=A0> If you think this is a good idea, I can spend more time working =
out a<br>
=C2=A0> solution, which will undoubtedly add more complexity. Honestly t=
he<br>
=C2=A0> application is already cooked if they cannot allocate more memor=
y at =3D<br>
=C2=A0this<br>
=C2=A0> point, and often it's easier to restart it then to keep runn=
ing. But =3D<br>
=C2=A0if<br>
=C2=A0> that's what it takes to optimize the memory usage I can do i=
t. The =3D<br>
=C2=A0memory<br>
=C2=A0> savings can be huge.<br>
=C2=A0>=3D20<br>
<br>
=C2=A0Yes, but it is not up to the library to abort or exit if it can't=
=3D<br>
=C2=A0allocate memory,<br>
=C2=A0specially one that might not be the primary function of the applicati=
on =3D<br>
=C2=A0like<br>
=C2=A0command line editing. The application might have already allocated al=
l<br>
=C2=A0the memory it needs to operate and just the editor part might be<br>
=C2=A0non-functional.=C2=A0 The library does not abort() or exit() anywhere=
else<br>
=C2=A0now, (there are abort() calls from programming errors, not transient =
=3D<br>
=C2=A0ones).<br>
<br>
=C2=A0christos=3D<br>
<br>
</blockquote></div>
--00000000000009c45d06602d77a0--
--00000000000009c46006602d77a2
Content-Type: application/octet-stream;
name="netbsd-libedit-lazy-buffer-allocation-v2.patch"
Content-Disposition: attachment;
filename="netbsd-libedit-lazy-buffer-allocation-v2.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_mwfdbe6r0>
X-Attachment-Id: f_mwfdbe6r0
U3ViamVjdDogbGliZWRpdDogYWxsb2NhdGUgZGlzcGxheSByb3dzIG9uIGRlbWFuZAoKbGliZWRp
dCAodW5saWtlIHJlYWRsaW5lKSBhbGxvY2F0ZXMgYSBidWZmZXIgZm9yIHRoZSBlbnRpcmUgdGVy
bWluYWwgd2lkdGggKgpoZWlnaHQgZnJvbSB0aGUgYmVnaW5uaW5nLCB3aGljaCBpcyBvZnRlbiB3
YXN0ZWZ1bCBhcyBtb3N0IG9mIHRoZSB0aW1lIHZlcnkKZmV3IHJvd3MgYXJlIG5lZWRlZC4gVGhp
cyBjaGFuZ2UgaW50cm9kdWNlcyBkZWxheWVkIGFsbG9jYXRpb24gZm9yIHJvdyBidWZmZXJzLgpJ
bml0aWFsbHksIHRoZSByb3ctcG9pbnRlciBhcnJheSBpcyBhbGxvY2F0ZWQgd2l0aCBOVUxMIHBv
aW50ZXJzLiBXaGVuIHdlIG5lZWQKcm93IE4sIHdlIGFsbG9jYXRlIGFsbCByb3cgYnVmZmVycyB1
cCB0byB0aGF0IHJvdy4KCkRpc3BsYXkgYnVmZmVyIGFsbG9jYXRpb24gZmFpbHVyZXMgYXJlIHJl
cG9ydGVkIHRocm91Z2ggZXhpc3RpbmcgQVBJIGVycm9ycy4KQSBzdWJzZXF1ZW50IEFQSSBjYWxs
IHN1Y2ggYXMgZWxfZ2V0cygpIHJldHJpZXMgdGhlIGFsbG9jYXRpb24gaWYgbmVlZGVkLgoKLS0t
IGEvbGliL2xpYmVkaXQvdGVybWluYWwuaAorKysgYi9saWIvbGliZWRpdC90ZXJtaW5hbC5oCkBA
IC01MCw2ICs1MCw3IEBACiB0eXBlZGVmIHN0cnVjdCB7CiAJY29uc3QgY2hhciAqdF9uYW1lOwkJ
LyogdGhlIHRlcm1pbmFsIG5hbWUJKi8KIAljb29yZF90CSAgdF9zaXplOwkJLyogIyBsaW5lcyBh
bmQgY29scwkqLworCWludAkgIHRfYWxsb2NhdGVkX3Jvd3M7CS8qIE51bWJlciBvZiBhbGxvY2F0
ZWQgcm93cyAqLwogCWludAkgIHRfZmxhZ3M7CiAjZGVmaW5lCVRFUk1fQ0FOX0lOU0VSVAkJMHgw
MDEJLyogSGFzIGluc2VydCBjYXAJKi8KICNkZWZpbmUJVEVSTV9DQU5fREVMRVRFCQkweDAwMgkv
KiBIYXMgZGVsZXRlIGNhcAkqLwpAQCAtOTAsNiArOTEsNyBAQAogbGliZWRpdF9wcml2YXRlIHZv
aWQJdGVybWluYWxfYmVlcChFZGl0TGluZSAqKTsKIGxpYmVkaXRfcHJpdmF0ZSBpbnQJdGVybWlu
YWxfY2hhbmdlX3NpemUoRWRpdExpbmUgKiwgaW50LCBpbnQpOwogbGliZWRpdF9wcml2YXRlIGlu
dAl0ZXJtaW5hbF9nZXRfc2l6ZShFZGl0TGluZSAqLCBpbnQgKiwgaW50ICopOworbGliZWRpdF9w
cml2YXRlIGludAl0ZXJtaW5hbF9hbGxvY19yb3dzKEVkaXRMaW5lICosIGludCk7CiBsaWJlZGl0
X3ByaXZhdGUgaW50CXRlcm1pbmFsX2luaXQoRWRpdExpbmUgKik7CiBsaWJlZGl0X3ByaXZhdGUg
dm9pZAl0ZXJtaW5hbF9iaW5kX2Fycm93KEVkaXRMaW5lICopOwogbGliZWRpdF9wcml2YXRlIHZv
aWQJdGVybWluYWxfcHJpbnRfYXJyb3coRWRpdExpbmUgKiwgY29uc3Qgd2NoYXJfdCAqKTsKLS0t
IGEvbGliL2xpYmVkaXQvdGVybWluYWwuYworKysgYi9saWIvbGliZWRpdC90ZXJtaW5hbC5jCkBA
IC00OCw2ICs0OCw3IEBACiAgKi8KICNpbmNsdWRlIDxzeXMvdHlwZXMuaD4KICNpbmNsdWRlIDxz
eXMvaW9jdGwuaD4KKyNpbmNsdWRlIDxlcnJuby5oPgogI2luY2x1ZGUgPGxpbWl0cy5oPgogI2lu
Y2x1ZGUgPHNpZ25hbC5oPgogI2luY2x1ZGUgPHN0ZGlvLmg+CkBAIC0zMDAsNiArMzAxLDggQEAK
IAlpZiAoZWwtPmVsX3Rlcm1pbmFsLnRfdmFsID09IE5VTEwpCiAJCWdvdG8gb3V0OwogCSh2b2lk
KSB0ZXJtaW5hbF9zZXQoZWwsIE5VTEwpOworCWlmIChlbC0+ZWxfcmVmcmVzaC5yX2Vycm9yKQor
CQlnb3RvIG91dDsKIAl0ZXJtaW5hbF9pbml0X2Fycm93KGVsKTsKIAlyZXR1cm4gMDsKIG91dDoK
QEAgLTQwMSwzOSArNDA0LDU2IEBACiBzdGF0aWMgaW50CiB0ZXJtaW5hbF9yZWJ1ZmZlcl9kaXNw
bGF5KEVkaXRMaW5lICplbCkKIHsKLQljb29yZF90ICpjID0gJmVsLT5lbF90ZXJtaW5hbC50X3Np
emU7Ci0KLQl0ZXJtaW5hbF9mcmVlX2Rpc3BsYXkoZWwpOwotCi0JYy0+aCA9IFZhbChUX2NvKTsK
LQljLT52ID0gVmFsKFRfbGkpOwotCi0JaWYgKHRlcm1pbmFsX2FsbG9jX2Rpc3BsYXkoZWwpID09
IC0xKQotCQlyZXR1cm4gLTE7Ci0JcmV0dXJuIDA7CisJcmV0dXJuIHRlcm1pbmFsX2FsbG9jX2Rp
c3BsYXkoZWwpOwogfQogCisvKiB0ZXJtaW5hbF9hbGxvY19idWZmZXIoKToKKyAqCUFsbG9jYXRl
IGEgemVyb2VkIHJvdy1wb2ludGVyIGFycmF5LCBsZWF2aW5nIHJvd3MgdW5hbGxvY2F0ZWQuCisg
Ki8KIHN0YXRpYyB3aW50X3QgKioKLXRlcm1pbmFsX2FsbG9jX2J1ZmZlcihFZGl0TGluZSAqZWwp
Cit0ZXJtaW5hbF9hbGxvY19idWZmZXIoaW50IHJvd3MpCit7CisJcmV0dXJuIGVsX2NhbGxvYygo
c2l6ZV90KShyb3dzICsgMSksIHNpemVvZih3aW50X3QgKikpOworfQorCisvKiB0ZXJtaW5hbF9h
bGxvY19yb3dzKCk6CisgKglBbGxvY2F0ZSByb3cgYnVmZmVycyB1cCB0byBhbmQgaW5jbHVkaW5n
IHRoZSBzcGVjaWZpZWQgcm93LAorICoJaWYgbm90IGFscmVhZHkgYWxsb2NhdGVkLiBSZXR1cm4g
LTEgb24gYWxsb2NhdGlvbiBmYWlsdXJlLgorICovCitsaWJlZGl0X3ByaXZhdGUgaW50Cit0ZXJt
aW5hbF9hbGxvY19yb3dzKEVkaXRMaW5lICplbCwgaW50IHJvdykKIHsKLQl3aW50X3QgKipiOwog
CWNvb3JkX3QgKmMgPSAmZWwtPmVsX3Rlcm1pbmFsLnRfc2l6ZTsKKwl3aW50X3QgKnJlYWwsICp2
aXJ0OwogCWludCBpOwogCi0JYiA9ICBlbF9jYWxsb2MoKHNpemVfdCkoYy0+diArIDEpLCBzaXpl
b2YoKmIpKTsKLQlpZiAoYiA9PSBOVUxMKQotCQlyZXR1cm4gTlVMTDsKLQlmb3IgKGkgPSAwOyBp
IDwgYy0+djsgaSsrKSB7Ci0JCWJbaV0gPSBlbF9jYWxsb2MoKHNpemVfdCkoYy0+aCArIDEpLCBz
aXplb2YoKipiKSk7Ci0JCWlmIChiW2ldID09IE5VTEwpIHsKLQkJCXdoaWxlICgtLWkgPj0gMCkK
LQkJCQllbF9mcmVlKGJbaV0pOwotCQkJZWxfZnJlZShiKTsKLQkJCXJldHVybiBOVUxMOworCWlm
IChlbC0+ZWxfcmVmcmVzaC5yX2Vycm9yKQorCQlyZXR1cm4gLTE7CisKKwlpZiAocm93IDwgMCB8
fCByb3cgPj0gYy0+dikgeworCQkodm9pZCkgZnByaW50ZihlbC0+ZWxfZXJyZmlsZSwKKwkJICAg
ICJsaWJlZGl0OiBpbnZhbGlkIGRpc3BsYXkgcm93ICVkXG4iLCByb3cpOworCQkodm9pZCkgZmZs
dXNoKGVsLT5lbF9lcnJmaWxlKTsKKwkJYWJvcnQoKTsKKwl9CisJd2hpbGUgKGVsLT5lbF90ZXJt
aW5hbC50X2FsbG9jYXRlZF9yb3dzIDw9IHJvdykgeworCQlpID0gZWwtPmVsX3Rlcm1pbmFsLnRf
YWxsb2NhdGVkX3Jvd3M7CisJCXJlYWwgPSBlbF9jYWxsb2MoKHNpemVfdCkoYy0+aCArIDEpLCBz
aXplb2YoKnJlYWwpKTsKKwkJaWYgKHJlYWwgPT0gTlVMTCkKKwkJCWdvdG8gZmFpbDsKKwkJdmly
dCA9IGVsX2NhbGxvYygoc2l6ZV90KShjLT5oICsgMSksIHNpemVvZigqdmlydCkpOworCQlpZiAo
dmlydCA9PSBOVUxMKSB7CisJCQllbF9mcmVlKHJlYWwpOworCQkJZ290byBmYWlsOwogCQl9CisJ
CWVsLT5lbF9kaXNwbGF5W2ldID0gcmVhbDsKKwkJZWwtPmVsX3ZkaXNwbGF5W2ldID0gdmlydDsK
KwkJZWwtPmVsX3Rlcm1pbmFsLnRfYWxsb2NhdGVkX3Jvd3MrKzsKIAl9Ci0JYltjLT52XSA9IE5V
TEw7Ci0JcmV0dXJuIGI7CisJcmV0dXJuIDA7CitmYWlsOgorCWVsLT5lbF9yZWZyZXNoLnJfZXJy
b3IgPSBlcnJubyA9IEVOT01FTTsKKwlyZXR1cm4gLTE7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC00
NTksMTUgKzQ3OSwyNSBAQAogc3RhdGljIGludAogdGVybWluYWxfYWxsb2NfZGlzcGxheShFZGl0
TGluZSAqZWwpCiB7Ci0JZWwtPmVsX2Rpc3BsYXkgPSB0ZXJtaW5hbF9hbGxvY19idWZmZXIoZWwp
OwotCWlmIChlbC0+ZWxfZGlzcGxheSA9PSBOVUxMKQotCQlnb3RvIGRvbmU7Ci0JZWwtPmVsX3Zk
aXNwbGF5ID0gdGVybWluYWxfYWxsb2NfYnVmZmVyKGVsKTsKLQlpZiAoZWwtPmVsX3ZkaXNwbGF5
ID09IE5VTEwpCi0JCWdvdG8gZG9uZTsKLQlyZXR1cm4gMDsKLWRvbmU6CisJd2ludF90ICoqZGlz
cGxheSwgKip2ZGlzcGxheTsKKworCWRpc3BsYXkgPSB0ZXJtaW5hbF9hbGxvY19idWZmZXIoVmFs
KFRfbGkpKTsKKwlpZiAoZGlzcGxheSA9PSBOVUxMKQorCQlnb3RvIGZhaWw7CisJdmRpc3BsYXkg
PSB0ZXJtaW5hbF9hbGxvY19idWZmZXIoVmFsKFRfbGkpKTsKKwlpZiAodmRpc3BsYXkgPT0gTlVM
TCkgeworCQllbF9mcmVlKGRpc3BsYXkpOworCQlnb3RvIGZhaWw7CisJfQorCS8qIEtlZXAgdGhl
IG9sZCBkaXNwbGF5IGFuZCBkaW1lbnNpb25zIHVudGlsIGJvdGggYXJyYXlzIGFyZSByZWFkeS4g
Ki8KIAl0ZXJtaW5hbF9mcmVlX2Rpc3BsYXkoZWwpOworCWVsLT5lbF90ZXJtaW5hbC50X3NpemUu
aCA9IFZhbChUX2NvKTsKKwllbC0+ZWxfdGVybWluYWwudF9zaXplLnYgPSBWYWwoVF9saSk7CisJ
ZWwtPmVsX2Rpc3BsYXkgPSBkaXNwbGF5OworCWVsLT5lbF92ZGlzcGxheSA9IHZkaXNwbGF5Owor
CXJldHVybiAwOworZmFpbDoKKwllbC0+ZWxfcmVmcmVzaC5yX2Vycm9yID0gZXJybm8gPSBFTk9N
RU07CiAJcmV0dXJuIC0xOwogfQogCkBAIC00ODAsNiArNTEwLDcgQEAKIHsKIAl0ZXJtaW5hbF9m
cmVlX2J1ZmZlcigmZWwtPmVsX2Rpc3BsYXkpOwogCXRlcm1pbmFsX2ZyZWVfYnVmZmVyKCZlbC0+
ZWxfdmRpc3BsYXkpOworCWVsLT5lbF90ZXJtaW5hbC50X2FsbG9jYXRlZF9yb3dzID0gMDsKIH0K
IAogCkBAIC01NTksNiArNTkwLDkgQEAKIAkJCQl0ZXJtaW5hbF90cHV0cyhlbCwgdGdvdG8oU3Ry
KFRfUkkpLCBkZWwsIGRlbCksCiAJCQkJICAgIGRlbCk7CiAJCQllbHNlIHsKKwkJCQkvKiBBIHJl
c2l6ZSBtYXkgbGVhdmUgdGhpcyByb3cgdW5hbGxvY2F0ZWQuICovCisJCQkJaWYgKHRlcm1pbmFs
X2FsbG9jX3Jvd3MoZWwsIGVsLT5lbF9jdXJzb3IudikgPT0gLTEpCisJCQkJCXJldHVybjsKIAkJ
CQkJLyogaWYgSSBjYW4gZG8gdGFicywgdXNlIHRoZW0gKi8KIAkJCQlpZiAoRUxfQ0FOX1RBQikg
ewogCQkJCQlpZiAoKGVsLT5lbF9jdXJzb3IuaCAmIDAzNzApICE9CkBAIC02NTIsNyArNjg2LDgg
QEAKIAkJCQkvKiBmb3JjZSB0aGUgd3JhcCB0byBhdm9pZCB0aGUgIm1hZ2ljIgogCQkJCSAqIHNp
dHVhdGlvbiAqLwogCQkJCXdjaGFyX3QgYzsKLQkJCQlpZiAoKGMgPSBlbC0+ZWxfZGlzcGxheVtl
bC0+ZWxfY3Vyc29yLnZdCisJCQkJaWYgKGVsLT5lbF9kaXNwbGF5W2VsLT5lbF9jdXJzb3Iudl0g
IT0gTlVMTCAmJgorCQkJCSAgICAoYyA9IGVsLT5lbF9kaXNwbGF5W2VsLT5lbF9jdXJzb3Iudl0K
IAkJCQkgICAgW2VsLT5lbF9jdXJzb3IuaF0pICE9ICdcMCcpIHsKIAkJCQkJdGVybWluYWxfb3Zl
cndyaXRlKGVsLCAmYywgKHNpemVfdCkxKTsKIAkJCQkJd2hpbGUgKGVsLT5lbF9kaXNwbGF5W2Vs
LT5lbF9jdXJzb3Iudl0KQEAgLTgzNiw3ICs4NzEsNyBAQAogbGliZWRpdF9wcml2YXRlIGludAog
dGVybWluYWxfc2V0KEVkaXRMaW5lICplbCwgY29uc3QgY2hhciAqdGVybSkKIHsKLQlpbnQgaTsK
KwlpbnQgaSwgcnY7CiAJY2hhciBidWZbVENfQlVGU0laRV07CiAJY2hhciAqYXJlYTsKIAljb25z
dCBzdHJ1Y3QgdGVybWNhcHN0ciAqdDsKQEAgLTkwMiwxNiArOTM3LDE0IEBACiAJaWYgKFZhbChU
X2xpKSA8IDEpCiAJCVZhbChUX2xpKSA9IDI0OwogCi0JZWwtPmVsX3Rlcm1pbmFsLnRfc2l6ZS52
ID0gVmFsKFRfY28pOwotCWVsLT5lbF90ZXJtaW5hbC50X3NpemUuaCA9IFZhbChUX2xpKTsKLQog
CXRlcm1pbmFsX3NldGZsYWdzKGVsKTsKIAogCQkJCS8qIGdldCB0aGUgY29ycmVjdCB3aW5kb3cg
c2l6ZSAqLwogCSh2b2lkKSB0ZXJtaW5hbF9nZXRfc2l6ZShlbCwgJmxpbnMsICZjb2xzKTsKLQlp
ZiAodGVybWluYWxfY2hhbmdlX3NpemUoZWwsIGxpbnMsIGNvbHMpID09IC0xKQotCQlyZXR1cm4g
LTE7CisJcnYgPSB0ZXJtaW5hbF9jaGFuZ2Vfc2l6ZShlbCwgbGlucywgY29scyk7CiAJKHZvaWQp
IHNpZ3Byb2NtYXNrKFNJR19TRVRNQVNLLCAmb3NldCwgTlVMTCk7CisJaWYgKHJ2ID09IC0xKQor
CQlyZXR1cm4gLTE7CiAJdGVybWluYWxfYmluZF9hcnJvdyhlbCk7CiAJZWwtPmVsX3Rlcm1pbmFs
LnRfbmFtZSA9IHRlcm07CiAJcmV0dXJuIGkgPD0gMCA/IC0xIDogMDsKQEAgLTk2OSw4ICsxMDAy
LDExIEBACiAJVmFsKFRfbGkpID0gKGxpbnMgPCAxKSA/IDI0IDogbGluczsKIAogCS8qIHJlLW1h
a2UgZGlzcGxheSBidWZmZXJzICovCi0JaWYgKHRlcm1pbmFsX3JlYnVmZmVyX2Rpc3BsYXkoZWwp
ID09IC0xKQorCWlmICh0ZXJtaW5hbF9yZWJ1ZmZlcl9kaXNwbGF5KGVsKSA9PSAtMSkgeworCQlW
YWwoVF9jbykgPSBlbC0+ZWxfdGVybWluYWwudF9zaXplLmg7CisJCVZhbChUX2xpKSA9IGVsLT5l
bF90ZXJtaW5hbC50X3NpemUudjsKIAkJcmV0dXJuIC0xOworCX0KIAlyZV9jbGVhcl9kaXNwbGF5
KGVsKTsKIAllbC0+ZWxfY3Vyc29yID0gY3VyOwogCXJldHVybiAwOwpAQCAtMTM3NiwxNSArMTQx
Miw4IEBACiAJCXJldHVybiAtMTsKIAl9CiAJZWwtPmVsX3Rlcm1pbmFsLnRfdmFsW3R2IC0gdHZh
bF0gPSAoaW50KSBpOwotCWkgPSAwOwotCWlmICh0diA9PSAmdHZhbFtUX2NvXSkgewotCQllbC0+
ZWxfdGVybWluYWwudF9zaXplLnYgPSBWYWwoVF9jbyk7Ci0JCWkrKzsKLQl9IGVsc2UgaWYgKHR2
ID09ICZ0dmFsW1RfbGldKSB7Ci0JCWVsLT5lbF90ZXJtaW5hbC50X3NpemUuaCA9IFZhbChUX2xp
KTsKLQkJaSsrOwotCX0KLQlpZiAoaSAmJiB0ZXJtaW5hbF9jaGFuZ2Vfc2l6ZShlbCwgVmFsKFRf
bGkpLCBWYWwoVF9jbykpID09IC0xKQorCWlmICgodHYgPT0gJnR2YWxbVF9jb10gfHwgdHYgPT0g
JnR2YWxbVF9saV0pICYmCisJICAgIHRlcm1pbmFsX2NoYW5nZV9zaXplKGVsLCBWYWwoVF9saSks
IFZhbChUX2NvKSkgPT0gLTEpCiAJCXJldHVybiAtMTsKIAlyZXR1cm4gMDsKIH0KLS0tIGEvbGli
L2xpYmVkaXQvcmVmcmVzaC5oCisrKyBiL2xpYi9saWJlZGl0L3JlZnJlc2guaApAQCAtNDQsNiAr
NDQsNyBAQAogCWNvb3JkX3QJcl9jdXJzb3I7CS8qIFJlZnJlc2ggY3Vyc29yIHBvc2l0aW9uCSov
CiAJaW50CXJfb2xkY3Y7CS8qIFZlcnRpY2FsIGxvY2F0aW9ucwkJKi8KIAlpbnQJcl9uZXdjdjsK
KwlpbnQJcl9lcnJvcjsJLyogRGlzcGxheSBlcnJvciBwcm9wYWdhdGVkIHRvIHRoZSBjYWxsZXIg
Ki8KIH0gZWxfcmVmcmVzaF90OwogCiBsaWJlZGl0X3ByaXZhdGUgdm9pZAlyZV9wdXRjKEVkaXRM
aW5lICosIHdpbnRfdCwgaW50KTsKLS0tIGEvbGliL2xpYmVkaXQvcmVmcmVzaC5jCisrKyBiL2xp
Yi9saWJlZGl0L3JlZnJlc2guYwpAQCAtOTUsNiArOTUsOSBAQAogc3RhdGljIHZvaWQKIHJlX25l
eHRsaW5lKEVkaXRMaW5lICplbCkKIHsKKwlpZiAoZWwtPmVsX3JlZnJlc2gucl9lcnJvcikKKwkJ
cmV0dXJuOworCiAJZWwtPmVsX3JlZnJlc2gucl9jdXJzb3IuaCA9IDA7CS8qIHJlc2V0IGl0LiAq
LwogCiAJLyoKQEAgLTEzMSw2ICsxMzQsOCBAQAogCWNhc2UgQ0hUWVBFX1RBQjogICAgICAgIC8q
IGV4cGFuZCB0aGUgdGFiICovCiAJCWZvciAoOzspIHsKIAkJCXJlX3B1dGMoZWwsICcgJywgMSk7
CisJCQlpZiAoZWwtPmVsX3JlZnJlc2gucl9lcnJvcikKKwkJCQlyZXR1cm47CiAJCQlpZiAoKGVs
LT5lbF9yZWZyZXNoLnJfY3Vyc29yLmggJiAwNykgPT0gMCkKIAkJCQlicmVhazsJCQkvKiBnbyB1
bnRpbCB0YWIgc3RvcCAqLwogCQl9CkBAIC0xNzAsNiArMTc1LDggQEAKIAljID0gbGl0ZXJhbF9h
ZGQoZWwsIGJlZ2luLCBlbmQsICZ3KTsKIAlpZiAoYyA9PSAwIHx8IHcgPCAwKQogCQlyZXR1cm47
CisJaWYgKHRlcm1pbmFsX2FsbG9jX3Jvd3MoZWwsIGN1ci0+dikgPT0gLTEpCisJCXJldHVybjsK
IAllbC0+ZWxfdmRpc3BsYXlbY3VyLT52XVtjdXItPmhdID0gYzsKIAogCWkgPSB3OwpAQCAtMjAw
LDkgKzIwNywxNCBAQAogCWlmICh3ID09IC0xKQogCQl3ID0gMDsKIAotCXdoaWxlIChzaGlmdCAm
JiAoY3VyLT5oICsgdyA+IHNpemVoKSkKLQkgICAgcmVfcHV0YyhlbCwgJyAnLCAxKTsKKwl3aGls
ZSAoc2hpZnQgJiYgKGN1ci0+aCArIHcgPiBzaXplaCkpIHsKKwkJcmVfcHV0YyhlbCwgJyAnLCAx
KTsKKwkJaWYgKGVsLT5lbF9yZWZyZXNoLnJfZXJyb3IpCisJCQlyZXR1cm47CisJfQogCisJaWYg
KHRlcm1pbmFsX2FsbG9jX3Jvd3MoZWwsIGN1ci0+dikgPT0gLTEpCisJCXJldHVybjsKIAllbC0+
ZWxfdmRpc3BsYXlbY3VyLT52XVtjdXItPmhdID0gYzsKIAkvKiBhc3N1bWVzICFzaGlmdCBpcyBv
bmx5IHVzZWQgZm9yIHNpbmdsZS1jb2x1bW4gY2hhcnMgKi8KIAlpID0gdzsKQEAgLTMyMiw2ICsz
MzQsOCBAQAogCX0KIAogCXJlX3B1dGMoZWwsICdcMCcsIDApOwkvKiBtYWtlIGxpbmUgZW5kZWQg
d2l0aCBOVUwsIG5vIGN1cnNvciBzaGlmdCAqLworCWlmIChlbC0+ZWxfcmVmcmVzaC5yX2Vycm9y
KQorCQlyZXR1cm47CiAKIAllbC0+ZWxfcmVmcmVzaC5yX25ld2N2ID0gZWwtPmVsX3JlZnJlc2gu
cl9jdXJzb3IudjsKIApAQCAtMTA5OCw5ICsxMTEyLDE0IEBACiAJaW50IHc7CiAKIAl3ID0gd2N3
aWR0aChjKTsKLQl3aGlsZSAodyA+IDEgJiYgZWwtPmVsX2N1cnNvci5oICsgdyA+IGVsLT5lbF90
ZXJtaW5hbC50X3NpemUuaCkKLQkgICAgcmVfZmFzdHB1dGMoZWwsICcgJyk7CisJd2hpbGUgKHcg
PiAxICYmIGVsLT5lbF9jdXJzb3IuaCArIHcgPiBlbC0+ZWxfdGVybWluYWwudF9zaXplLmgpIHsK
KwkJcmVfZmFzdHB1dGMoZWwsICcgJyk7CisJCWlmIChlbC0+ZWxfcmVmcmVzaC5yX2Vycm9yKQor
CQkJcmV0dXJuOworCX0KIAorCWlmICh0ZXJtaW5hbF9hbGxvY19yb3dzKGVsLCBlbC0+ZWxfY3Vy
c29yLnYpID09IC0xKQorCQlyZXR1cm47CiAJdGVybWluYWxfX3B1dGMoZWwsIGMpOwogCWVsLT5l
bF9kaXNwbGF5W2VsLT5lbF9jdXJzb3Iudl1bZWwtPmVsX2N1cnNvci5oKytdID0gYzsKIAl3aGls
ZSAoLS13ID4gMCkKQEAgLTExMjYsNiArMTE0NSw5IEBACiAKIAkJCWVsLT5lbF9kaXNwbGF5W2kg
LSAxXSA9IGxhc3RsaW5lOwogCQl9IGVsc2UgeworCQkJLyogQWxsb2NhdGUgYmVmb3JlIGFkdmFu
Y2luZyB0byB0aGUgbmV4dCByb3cuICovCisJCQlpZiAodGVybWluYWxfYWxsb2Nfcm93cyhlbCwg
ZWwtPmVsX2N1cnNvci52ICsgMSkgPT0gLTEpCisJCQkJcmV0dXJuOwogCQkJZWwtPmVsX2N1cnNv
ci52Kys7CiAJCQlsYXN0bGluZSA9IGVsLT5lbF9kaXNwbGF5WysrZWwtPmVsX3JlZnJlc2gucl9v
bGRjdl07CiAJCX0KQEAgLTEyMDIsNyArMTIyNCw3IEBACiAKIAllbC0+ZWxfY3Vyc29yLnYgPSAw
OwogCWVsLT5lbF9jdXJzb3IuaCA9IDA7Ci0JZm9yIChpID0gMDsgaSA8IGVsLT5lbF90ZXJtaW5h
bC50X3NpemUudjsgaSsrKQorCWZvciAoaSA9IDA7IGkgPCBlbC0+ZWxfdGVybWluYWwudF9hbGxv
Y2F0ZWRfcm93czsgaSsrKQogCQllbC0+ZWxfZGlzcGxheVtpXVswXSA9ICdcMCc7CiAJZWwtPmVs
X3JlZnJlc2gucl9vbGRjdiA9IDA7CiB9Ci0tLSBhL2xpYi9saWJlZGl0L3JlYWQuYworKysgYi9s
aWIvbGliZWRpdC9yZWFkLmMKQEAgLTI4OCw2ICsyODgsMTYgQEAKIAllbC0+ZWxfc2lnbmFsLT5z
aWdfbm8gPSAwOwogCXdoaWxlICgobnVtX3JlYWQgPSByZWFkKGVsLT5lbF9pbmZkLCBjYnVmICsg
Y2JwLCAoc2l6ZV90KTEpKSA9PSAtMSkgewogCQlpbnQgZSA9IGVycm5vOworCisJCS8qCisJCSAq
IEFuIGludGVycnVwdGluZyBzaWduYWwgaGFuZGxlciBtYXkgaGF2ZSBmYWlsZWQgdG8gYWxsb2Nh
dGUKKwkJICogZGlzcGxheSBidWZmZXJzIGR1cmluZyByZXNpemUgb3IgcmVkcmF3LiBTdG9wIGJl
Zm9yZSByZXRyeWluZy4KKwkJICovCisJCWlmIChlbC0+ZWxfcmVmcmVzaC5yX2Vycm9yKSB7CisJ
CQllcnJubyA9IGVsLT5lbF9yZWZyZXNoLnJfZXJyb3I7CisJCQkqY3AgPSBMJ1wwJzsKKwkJCXJl
dHVybiAtMTsKKwkJfQogCQlzd2l0Y2ggKGVsLT5lbF9zaWduYWwtPnNpZ19ubykgewogCQljYXNl
IFNJR0NPTlQ6CiAJCQllbF93c2V0KGVsLCBFTF9SRUZSRVNIKTsKQEAgLTM4Miw2ICszOTIsMTQg
QEAKIAlzdHJ1Y3QgbWFjcm9zICptYSA9ICZlbC0+ZWxfcmVhZC0+bWFjcm9zOwogCWludCBudW1f
cmVhZDsKIAorCS8qCisJICogU3RvcCByZWFkaW5nIGFmdGVyIGEgZGlzcGxheSBlcnJvciwgaW5j
bHVkaW5nIGluIG5lc3RlZCBwcm9tcHRzCisJICogYW5kIHNlYXJjaGVzLCBzbyBlbF93Z2V0cygp
IGNhbiByZXBvcnQgaXQgdG8gdGhlIGNhbGxlci4KKwkgKi8KKwlpZiAoZWwtPmVsX3JlZnJlc2gu
cl9lcnJvcikgeworCQllcnJubyA9IGVsLT5lbF9yZWZyZXNoLnJfZXJyb3I7CisJCXJldHVybiAt
MTsKKwl9CiAJdGVybWluYWxfX2ZsdXNoKGVsKTsKIAlmb3IgKDs7KSB7CiAJCWlmIChtYS0+bGV2
ZWwgPCAwKQpAQCAtNDIxLDYgKzQzOSw3IEBACiBsaWJlZGl0X3ByaXZhdGUgdm9pZAogcmVhZF9w
cmVwYXJlKEVkaXRMaW5lICplbCkKIHsKKwllbC0+ZWxfcmVmcmVzaC5yX2Vycm9yID0gMDsKIAlp
ZiAoZWwtPmVsX2ZsYWdzICYgSEFORExFX1NJR05BTFMpCiAJCXNpZ19zZXQoZWwpOwogCWlmIChl
bC0+ZWxfZmxhZ3MgJiBOT19UVFkpCkBAIC01MDYsOCArNTI1LDExIEBACiAJfQogI2VuZGlmIC8q
IEZJT05SRUFEICovCiAKLQlpZiAoKGVsLT5lbF9mbGFncyAmIFVOQlVGRkVSRUQpID09IDApCisJ
LyogUmV0cnkgYSBwcmV2aW91cyBmYWlsZWQgcmVhZF9wcmVwYXJlKCkgaW4gdW5idWZmZXJlZCBt
b2RlLiAqLworCWlmICgoZWwtPmVsX2ZsYWdzICYgVU5CVUZGRVJFRCkgPT0gMCB8fCBlbC0+ZWxf
cmVmcmVzaC5yX2Vycm9yKQogCQlyZWFkX3ByZXBhcmUoZWwpOworCWlmIChlbC0+ZWxfcmVmcmVz
aC5yX2Vycm9yKQorCQlnb3RvIGRpc3BsYXlfZXJyb3I7CiAKIAlpZiAoZWwtPmVsX2ZsYWdzICYg
RURJVF9ESVNBQkxFRCkgewogCQlpZiAoKGVsLT5lbF9mbGFncyAmIFVOQlVGRkVSRUQpID09IDAp
CkBAIC02MDMsNiArNjI1LDggQEAKIAkJCWJyZWFrOwogCX0KIAorCWlmIChlbC0+ZWxfcmVmcmVz
aC5yX2Vycm9yKQorCQlnb3RvIGRpc3BsYXlfZXJyb3I7CiAJdGVybWluYWxfX2ZsdXNoKGVsKTsJ
CS8qIGZsdXNoIGFueSBidWZmZXJlZCBvdXRwdXQgKi8KIAkvKiBtYWtlIHN1cmUgdGhlIHR0eSBp
cyBzZXQgdXAgY29ycmVjdGx5ICovCiAJaWYgKChlbC0+ZWxfZmxhZ3MgJiBVTkJVRkZFUkVEKSA9
PSAwKSB7CkBAIC02MjAsNCArNjQ0LDExIEBACiAJCXJldHVybiBOVUxMOwogCX0gZWxzZQogCQly
ZXR1cm4gZWwtPmVsX2xpbmUuYnVmZmVyOworCitkaXNwbGF5X2Vycm9yOgorCWlmICgoZWwtPmVs
X2ZsYWdzICYgVU5CVUZGRVJFRCkgPT0gMCkKKwkJcmVhZF9maW5pc2goZWwpOworCSpucmVhZCA9
IC0xOworCWVycm5vID0gZWwtPmVsX3JlZnJlc2gucl9lcnJvcjsKKwlyZXR1cm4gTlVMTDsKIH0K
LS0tIGEvbGliL2xpYmVkaXQvZWwuYworKysgYi9saWIvbGliZWRpdC9lbC5jCkBAIC0xMDAsNiAr
MTAwLDggQEAKIAllbC0+ZWxfZmxhZ3MgPSBmbGFnczsKIAogCWlmICh0ZXJtaW5hbF9pbml0KGVs
KSA9PSAtMSkgeworCQllbF9mcmVlKGVsLT5lbF9zY3JhdGNoLmNidWZmKTsKKwkJZWxfZnJlZShl
bC0+ZWxfc2NyYXRjaC53YnVmZik7CiAJCWVsX2ZyZWUoZWwtPmVsX3Byb2cpOwogCQllbF9mcmVl
KGVsKTsKIAkJcmV0dXJuIE5VTEw7CkBAIC0xNzIsNiArMTc0LDcgQEAKIHsKIAogCXR0eV9jb29r
ZWRtb2RlKGVsKTsKKwllbC0+ZWxfcmVmcmVzaC5yX2Vycm9yID0gMDsKIAljaF9yZXNldChlbCk7
CQkvKiBYWFg6IERvIHdlIHdhbnQgdGhhdD8gKi8KIH0KIApAQCAtMzM1LDYgKzMzOCwxMCBAQAog
CQlpZiAocnYgJiYgIShlbC0+ZWxfZmxhZ3MgJiBVTkJVRkZFUkVEKSkgewogCQkJZWwtPmVsX2Zs
YWdzIHw9IFVOQlVGRkVSRUQ7CiAJCQlyZWFkX3ByZXBhcmUoZWwpOworCQkJaWYgKGVsLT5lbF9y
ZWZyZXNoLnJfZXJyb3IpIHsKKwkJCQlydiA9IC0xOworCQkJCWJyZWFrOworCQkJfQogCQl9IGVs
c2UgaWYgKCFydiAmJiAoZWwtPmVsX2ZsYWdzICYgVU5CVUZGRVJFRCkpIHsKIAkJCWVsLT5lbF9m
bGFncyAmPSB+VU5CVUZGRVJFRDsKIAkJCXJlYWRfZmluaXNoKGVsKTsKQEAgLTM4MSw5ICszODgs
MTIgQEAKIAl9CiAKIAljYXNlIEVMX1JFRlJFU0g6CisJCWVsLT5lbF9yZWZyZXNoLnJfZXJyb3Ig
PSAwOwogCQlyZV9jbGVhcl9kaXNwbGF5KGVsKTsKIAkJcmVfcmVmcmVzaChlbCk7CiAJCXRlcm1p
bmFsX19mbHVzaChlbCk7CisJCWlmIChlbC0+ZWxfcmVmcmVzaC5yX2Vycm9yKQorCQkJcnYgPSAt
MTsKIAkJYnJlYWs7CiAKIAljYXNlIEVMX1dPUkRDSEFSUzoKLS0tIGEvbGliL2xpYmVkaXQvZWxu
LmMKKysrIGIvbGliL2xpYmVkaXQvZWxuLmMKQEAgLTI1MywxMCArMjUzLDcgQEAKIAl9CiAKIAlj
YXNlIEVMX1JFRlJFU0g6Ci0JCXJlX2NsZWFyX2Rpc3BsYXkoZWwpOwotCQlyZV9yZWZyZXNoKGVs
KTsKLQkJdGVybWluYWxfX2ZsdXNoKGVsKTsKLQkJcmV0ID0gMDsKKwkJcmV0ID0gZWxfd3NldChl
bCwgb3ApOwogCQlicmVhazsKIAogCWRlZmF1bHQ6Cg==
--00000000000009c46006602d77a2--
Home |
Main Index |
Thread Index |
Old Index