Date: Thu, 13 Sep 2001 05:46:00 -0400 (EDT) From: "Andrew R. Reiter" <arr@watson.org> To: freebsd-audit@freebsd.org Subject: inetd fd_set patch Message-ID: <Pine.NEB.3.96L.1010913054252.93735A-200000@fledge.watson.org>
next in thread | raw e-mail | index | archive | help
This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. --0-1488729123-1000374360=:93735 Content-Type: TEXT/PLAIN; charset=US-ASCII Hi, Attached is a patch that moves to dynamically allocated fd_set bit arrays. It can also be found at: http://www.watson.org/~arr/fbsd-audit/usr.sbin/inetd/inetd.c.diff Hope it helps, Andrew *-------------................................................. | Andrew R. Reiter | arr@fledge.watson.org | "It requires a very unusual mind | to undertake the analysis of the obvious" -- A.N. Whitehead --0-1488729123-1000374360=:93735 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="inetd.c.diff" Content-Transfer-Encoding: BASE64 Content-ID: <Pine.NEB.3.96L.1010913054600.93735B@fledge.watson.org> Content-Description: LS0tIGluZXRkLmMub3JpZwlUaHUgU2VwIDEzIDAxOjQ2OjExIDIwMDENCisr KyBpbmV0ZC5jCVRodSBTZXAgMTMgMDM6Mzg6MDkgMjAwMQ0KQEAgLTIwNCw2 ICsyMDQsOCBAQA0KIA0KICNkZWZpbmUJU0lHQkxPQ0sJKHNpZ21hc2soU0lH Q0hMRCl8c2lnbWFzayhTSUdIVVApfHNpZ21hc2soU0lHQUxSTSkpDQogDQor I2RlZmluZQlmZF9ob3dtYW55KHgsIHkpCSgoKHgpICsgKCh5KSAtIDEpKSAv ICh5KSkNCisNCiB2b2lkCQljbG9zZV9zZXAgX19QKChzdHJ1Y3Qgc2VydnRh YiAqKSk7DQogdm9pZAkJZmxhZ19zaWduYWwgX19QKChpbnQpKTsNCiB2b2lk CQlmbGFnX2NvbmZpZyBfX1AoKGludCkpOw0KQEAgLTIzNiw3ICsyMzgsOCBA QA0KIGludAlkZWJ1ZyA9IDA7DQogaW50CWxvZyA9IDA7DQogaW50CW1heHNv Y2s7CQkJLyogaGlnaGVzdC1udW1iZXJlZCBkZXNjcmlwdG9yICovDQotZmRf c2V0CWFsbHNvY2s7DQorZmRfc2V0CSphbGxzb2NrOw0KK2ludAlhbGxzb2Nr X2xlbjsNCiBpbnQJb3B0aW9uczsNCiBpbnQJdGltaW5nb3V0Ow0KIGludAl0 b29tYW55ID0gVE9PTUFOWTsNCkBAIC0zMTcsNiArMzIwLDkgQEANCiAJY29u c3QgY2hhciAqc2Vydm5hbWU7DQogCWludCBlcnJvcjsNCiANCisJbWF4c29j ayA9IGFsbHNvY2tfbGVuID0gMDsNCisJYWxsc29jayA9IE5VTEw7DQorDQog CW9wZW5sb2coImluZXRkIiwgTE9HX1BJRCB8IExPR19OT1dBSVQsIExPR19E QUVNT04pOw0KIA0KIAl3aGlsZSAoKGNoID0gZ2V0b3B0KGFyZ2MsIGFyZ3Ys ICJkbHdXUjphOmM6QzpwOiIpKSAhPSAtMSkNCkBAIC00NjYsNyArNDcyLDYg QEANCiAJc2lnYWN0aW9uKFNJR0NITEQsICZzYSwgJnNhY2hsZCk7DQogCXNh LnNhX2hhbmRsZXIgPSBTSUdfSUdOOw0KIAlzaWdhY3Rpb24oU0lHUElQRSwg JnNhLCAmc2FwaXBlKTsNCi0NCiAJew0KIAkJLyogc3BhY2UgZm9yIGRhZW1v bnMgdG8gb3ZlcndyaXRlIGVudmlyb25tZW50IGZvciBwcyAqLw0KICNkZWZp bmUJRFVNTVlTSVpFCTEwMA0KQEAgLTQ3OSwyOSArNDg0LDM5IEBADQogDQog CWlmIChwaXBlKHNpZ25hbHBpcGUpICE9IDApIHsNCiAJCXN5c2xvZyhMT0df RVJSLCAicGlwZTogJW0iKTsNCisJCWlmIChhbGxzb2NrKQ0KKwkJICAgIGZy ZWUoYWxsc29jayk7DQogCQlleGl0KEVYX09TRVJSKTsNCiAJfQ0KLQlGRF9T RVQoc2lnbmFscGlwZVswXSwgJmFsbHNvY2spOw0KICNpZmRlZiBTQU5JVFlf Q0hFQ0sNCiAJbnNvY2srKzsNCiAjZW5kaWYNCi0JaWYgKHNpZ25hbHBpcGVb MF0gPiBtYXhzb2NrKQ0KKwlpZiAoc2lnbmFscGlwZVswXSA+IG1heHNvY2sp IA0KIAkgICAgbWF4c29jayA9IHNpZ25hbHBpcGVbMF07DQogCWlmIChzaWdu YWxwaXBlWzFdID4gbWF4c29jaykNCiAJICAgIG1heHNvY2sgPSBzaWduYWxw aXBlWzFdOw0KKwlpZiAobWF4c29jayA+PSBhbGxzb2NrX2xlbikgew0KKwkg ICAgYWxsc29ja19sZW4gPSBtYXhzb2NrICsgMTsNCisJICAgIGlmIChyZWFs bG9jZihhbGxzb2NrLCBhbGxzb2NrX2xlbiAqIHNpemVvZihmZF9tYXNrKSkg PT0gTlVMTCkNCisJCWVycngoMSwgInJlYWxsb2NmIik7DQorCX0gDQorCQ0K KwlGRF9TRVQoc2lnbmFscGlwZVswXSwgYWxsc29jayk7DQogDQogCWZvciAo OzspIHsNCiAJICAgIGludCBuLCBjdHJsOw0KLQkgICAgZmRfc2V0IHJlYWRh YmxlOw0KKwkgICAgZmRfc2V0ICpyZWFkYWJsZTsNCiANCiAjaWZkZWYgU0FO SVRZX0NIRUNLDQogCSAgICBpZiAobnNvY2sgPT0gMCkgew0KIAkJc3lzbG9n KExPR19FUlIsICIlczogbnNvY2s9MCIsIF9fRlVOQ1RJT05fXyk7DQorCQlp ZiAoYWxsc29jaykNCisJCQlmcmVlKGFsbHNvY2spOw0KIAkJZXhpdChFWF9T T0ZUV0FSRSk7DQogCSAgICB9DQogI2VuZGlmDQogCSAgICByZWFkYWJsZSA9 IGFsbHNvY2s7DQotCSAgICBpZiAoKG4gPSBzZWxlY3QobWF4c29jayArIDEs ICZyZWFkYWJsZSwgKGZkX3NldCAqKTAsDQorCSAgICBpZiAoKG4gPSBzZWxl Y3QobWF4c29jayArIDEsIHJlYWRhYmxlLCAoZmRfc2V0ICopMCwNCiAJCShm ZF9zZXQgKikwLCAoc3RydWN0IHRpbWV2YWwgKikwKSkgPD0gMCkgew0KIAkJ ICAgIGlmIChuIDwgMCAmJiBlcnJubyAhPSBFSU5UUikgew0KIAkJCXN5c2xv ZyhMT0dfV0FSTklORywgInNlbGVjdDogJW0iKTsNCkBAIC01MTAsMTUgKzUy NSwxOSBAQA0KIAkJICAgIGNvbnRpbnVlOw0KIAkgICAgfQ0KIAkgICAgLyog aGFuZGxlIGFueSBxdWV1ZWQgc2lnbmFsIGZsYWdzICovDQotCSAgICBpZiAo RkRfSVNTRVQoc2lnbmFscGlwZVswXSwgJnJlYWRhYmxlKSkgew0KKwkgICAg aWYgKEZEX0lTU0VUKHNpZ25hbHBpcGVbMF0sIHJlYWRhYmxlKSkgew0KIAkJ aW50IG5zaWc7DQogCQlpZiAoaW9jdGwoc2lnbmFscGlwZVswXSwgRklPTlJF QUQsICZuc2lnKSAhPSAwKSB7DQorCQkgICAgaWYgKGFsbHNvY2spDQorCQkg ICAgICAgIGZyZWUoYWxsc29jayk7DQogCQkgICAgc3lzbG9nKExPR19FUlIs ICJpb2N0bDogJW0iKTsNCiAJCSAgICBleGl0KEVYX09TRVJSKTsNCiAJCX0N CiAJCXdoaWxlICgtLW5zaWcgPj0gMCkgew0KIAkJICAgIGNoYXIgYzsNCiAJ CSAgICBpZiAocmVhZChzaWduYWxwaXBlWzBdLCAmYywgMSkgIT0gMSkgew0K KwkJICAgICAgICBpZiAoYWxsc29jaykNCisJCQkgICAgZnJlZShhbGxzb2Nr KTsNCiAJCQlzeXNsb2coTE9HX0VSUiwgInJlYWQ6ICVtIik7DQogCQkJZXhp dChFWF9PU0VSUik7DQogCQkgICAgfQ0KQEAgLTUzOCw3ICs1NTcsNyBAQA0K IAkJfQ0KIAkgICAgfQ0KIAkgICAgZm9yIChzZXAgPSBzZXJ2dGFiOyBuICYm IHNlcDsgc2VwID0gc2VwLT5zZV9uZXh0KQ0KLQkgICAgICAgIGlmIChzZXAt PnNlX2ZkICE9IC0xICYmIEZEX0lTU0VUKHNlcC0+c2VfZmQsICZyZWFkYWJs ZSkpIHsNCisJICAgICAgICBpZiAoc2VwLT5zZV9mZCAhPSAtMSAmJiBGRF9J U1NFVChzZXAtPnNlX2ZkLCByZWFkYWJsZSkpIHsNCiAJCSAgICBuLS07DQog CQkgICAgaWYgKGRlYnVnKQ0KIAkJCSAgICB3YXJueCgic29tZW9uZSB3YW50 cyAlcyIsIHNlcC0+c2Vfc2VydmljZSk7DQpAQCAtNjY3LDYgKzY4Niw4IEBA DQogCQkJCXNlcC0+c2VfYmktPmJpX2ZuID09IChiaV9mbl90ICopIHRjcG11 eCkgew0KIAkJCQkgICAgc2VwID0gdGNwbXV4KGN0cmwpOw0KIAkJCQkgICAg aWYgKHNlcCA9PSBOVUxMKSB7DQorCQkJCQkgICAgaWYgKGFsbHNvY2spDQor CQkJCQkgICAgICAgIGZyZWUoYWxsc29jayk7DQogCQkJCQkgICAgY2xvc2Uo Y3RybCk7DQogCQkJCQkgICAgX2V4aXQoMCk7DQogCQkJCSAgICB9DQpAQCAt Njg3LDYgKzcwOCw4IEBADQogCQkJCSAgICBpZiAoc2VwLT5zZV9zb2NrdHlw ZSAhPSBTT0NLX1NUUkVBTSkNCiAJCQkJCXJlY3YoY3RybCwgYnVmLCBzaXpl b2YgKGJ1ZiksIDApOw0KIAkJCQkgICAgaWYgKGRvZm9yaykgew0KKwkJCQkJ aWYgKGFsbHNvY2spDQorCQkJCSAgICAgICAgICAgIGZyZWUoYWxsc29jayk7 DQogCQkJCQlzbGVlcCgxKTsNCiAJCQkJCV9leGl0KDApOw0KIAkJCQkgICAg fQ0KQEAgLTcxNCw2ICs3MzcsOCBAQA0KIAkJCQkJCXNlcC0+c2VfdXNlcik7 DQogCQkJCQlpZiAoc2VwLT5zZV9zb2NrdHlwZSAhPSBTT0NLX1NUUkVBTSkN CiAJCQkJCQlyZWN2KDAsIGJ1Ziwgc2l6ZW9mIChidWYpLCAwKTsNCisJCQkJ CWlmIChhbGxzb2NrKQ0KKwkJCQkJCWZyZWUoYWxsc29jayk7DQogCQkJCQlf ZXhpdChFWF9OT1VTRVIpOw0KIAkJCQl9DQogCQkJCWdycCA9IE5VTEw7DQpA QCAtNzI2LDYgKzc1MSw4IEBADQogCQkJCQkJc2VwLT5zZV9ncm91cCk7DQog CQkJCQlpZiAoc2VwLT5zZV9zb2NrdHlwZSAhPSBTT0NLX1NUUkVBTSkNCiAJ CQkJCQlyZWN2KDAsIGJ1Ziwgc2l6ZW9mIChidWYpLCAwKTsNCisJCQkJCWlm IChhbGxzb2NrKQ0KKwkJCQkJICAgIGZyZWUoYWxsc29jayk7DQogCQkJCQlf ZXhpdChFWF9OT1VTRVIpOw0KIAkJCQl9DQogCQkJCWlmIChncnAgIT0gTlVM TCkNCkBAIC03MzksNiArNzY2LDggQEANCiAJCQkJCQlzZXAtPnNlX2NsYXNz KTsNCiAJCQkJCWlmIChzZXAtPnNlX3NvY2t0eXBlICE9IFNPQ0tfU1RSRUFN KQ0KIAkJCQkJCXJlY3YoMCwgYnVmLCBzaXplb2YgKGJ1ZiksIDApOw0KKwkJ CQkJaWYgKGFsbHNvY2spDQorCQkJCQkgICAgZnJlZShhbGxzb2NrKTsNCiAJ CQkJCV9leGl0KEVYX05PVVNFUik7DQogCQkJCX0NCiAjZW5kaWYNCkBAIC03 NTQsNiArNzgzLDggQEANCiAJCQkJCXN5c2xvZyhMT0dfRVJSLA0KIAkJCQkJ ICIlczogY2FuJ3Qgc2V0dXNlcmNvbnRleHQoLi4lcy4uKTogJW0iLA0KIAkJ CQkJIHNlcC0+c2Vfc2VydmljZSwgc2VwLT5zZV91c2VyKTsNCisJCQkJCWlm IChhbGxzb2NrKQ0KKwkJCQkJICAgIGZyZWUoYWxsc29jayk7DQogCQkJCQlf ZXhpdChFWF9PU0VSUik7DQogCQkJCX0NCiAjZWxzZQ0KQEAgLTc2OCw2ICs3 OTksOCBAQA0KIAkJCQkJCXN5c2xvZyhMT0dfRVJSLA0KIAkJCQkJCSAgIiVz OiBjYW4ndCBzZXQgZ2lkICVkOiAlbSIsDQogCQkJCQkJICBzZXAtPnNlX3Nl cnZpY2UsIHB3ZC0+cHdfZ2lkKTsNCisJCQkJCQlpZiAoYWxsc29jaykNCisJ CQkJCQkgICAgZnJlZShhbGxzb2NrKTsNCiAJCQkJCQlfZXhpdChFWF9PU0VS Uik7DQogCQkJCQl9DQogCQkJCQkodm9pZCkgaW5pdGdyb3Vwcyhwd2QtPnB3 X25hbWUsDQpAQCAtNzc2LDYgKzgwOSw4IEBADQogCQkJCQkJc3lzbG9nKExP R19FUlIsDQogCQkJCQkJICAiJXM6IGNhbid0IHNldCB1aWQgJWQ6ICVtIiwN CiAJCQkJCQkgIHNlcC0+c2Vfc2VydmljZSwgcHdkLT5wd191aWQpOw0KKwkJ CQkJCWlmIChhbGxzb2NrKQ0KKwkJCQkJCSAgICBmcmVlKGFsbHNvY2spOw0K IAkJCQkJCV9leGl0KEVYX09TRVJSKTsNCiAJCQkJCX0NCiAJCQkJfQ0KQEAg LTc4OCwxMyArODIzLDE4IEBADQogCQkJCWlmIChzZXAtPnNlX3NvY2t0eXBl ICE9IFNPQ0tfU1RSRUFNKQ0KIAkJCQkJcmVjdigwLCBidWYsIHNpemVvZiAo YnVmKSwgMCk7DQogCQkJICAgIH0NCi0JCQkgICAgaWYgKGRvZm9yaykNCisJ CQkgICAgaWYgKGRvZm9yaykgew0KKwkJCQlpZiAoYWxsc29jaykNCisJCQkJ ICAgIGZyZWUoYWxsc29jayk7DQogCQkJCV9leGl0KDApOw0KKwkJCSAgICB9 CQkJICAgIA0KIAkJICAgIH0NCiAJCSAgICBpZiAoc2VwLT5zZV9hY2NlcHQg JiYgc2VwLT5zZV9zb2NrdHlwZSA9PSBTT0NLX1NUUkVBTSkNCiAJCQkgICAg Y2xvc2UoY3RybCk7DQogCQl9DQogCX0NCisJaWYgKGFsbHNvY2spDQorCSAg ICBmcmVlKGFsbHNvY2spOw0KIH0NCiANCiAvKg0KQEAgLTk1MCwxMCArOTkw LDEwIEBADQogCQkJaWYgKHNlcC0+c2VfZmQgPj0gMCkgew0KIAkJCSAgICAg IGlmIChzZXAtPnNlX21heGNoaWxkID4gMA0KIAkJCQkgICYmIHNlcC0+c2Vf bnVtY2hpbGQgPT0gc2VwLT5zZV9tYXhjaGlsZCkgew0KLQkJCQkgICAgICBp ZiAoRkRfSVNTRVQoc2VwLT5zZV9mZCwgJmFsbHNvY2spKQ0KKwkJCQkgICAg ICBpZiAoRkRfSVNTRVQoc2VwLT5zZV9mZCwgYWxsc29jaykpDQogCQkJCQkg IGRpc2FibGUoc2VwKTsNCiAJCQkgICAgICB9IGVsc2Ugew0KLQkJCQkgICAg ICBpZiAoIUZEX0lTU0VUKHNlcC0+c2VfZmQsICZhbGxzb2NrKSkNCisJCQkJ ICAgICAgaWYgKCFGRF9JU1NFVChzZXAtPnNlX2ZkLCBhbGxzb2NrKSkNCiAJ CQkJCSAgZW5hYmxlKHNlcCk7DQogCQkJICAgICAgfQ0KIAkJCX0NCkBAIC0x MzI5LDcgKzEzNjksNyBAQA0KIAlzdHJ1Y3Qgc2VydnRhYiAqc2VwOw0KIHsN CiAJaWYgKHNlcC0+c2VfZmQgPj0gMCkgew0KLQkJaWYgKEZEX0lTU0VUKHNl cC0+c2VfZmQsICZhbGxzb2NrKSkNCisJCWlmIChGRF9JU1NFVChzZXAtPnNl X2ZkLCBhbGxzb2NrKSkNCiAJCQlkaXNhYmxlKHNlcCk7DQogCQkodm9pZCkg Y2xvc2Uoc2VwLT5zZV9mZCk7DQogCQlzZXAtPnNlX2ZkID0gLTE7DQpAQCAt MTQwMiwxNiArMTQ0MiwyMCBAQA0KIAkJICAgICIlczogJXM6IGlzIG11eCIs IF9fRlVOQ1RJT05fXywgc2VwLT5zZV9zZXJ2aWNlKTsNCiAJCWV4aXQoRVhf U09GVFdBUkUpOw0KIAl9DQotCWlmIChGRF9JU1NFVChzZXAtPnNlX2ZkLCAm YWxsc29jaykpIHsNCisJaWYgKEZEX0lTU0VUKHNlcC0+c2VfZmQsIGFsbHNv Y2spKSB7DQogCQlzeXNsb2coTE9HX0VSUiwNCiAJCSAgICAiJXM6ICVzOiBu b3Qgb2ZmIiwgX19GVU5DVElPTl9fLCBzZXAtPnNlX3NlcnZpY2UpOw0KIAkJ ZXhpdChFWF9TT0ZUV0FSRSk7DQogCX0NCiAJbnNvY2srKzsNCiAjZW5kaWYN Ci0JRkRfU0VUKHNlcC0+c2VfZmQsICZhbGxzb2NrKTsNCiAJaWYgKHNlcC0+ c2VfZmQgPiBtYXhzb2NrKQ0KIAkJbWF4c29jayA9IHNlcC0+c2VfZmQ7DQor CWFsbHNvY2tfbGVuID0gbWF4c29jayArIDE7DQorCWFsbHNvY2sgPSBjYWxs b2MoZmRfaG93bWFueShhbGxzb2NrX2xlbiwgTkZEQklUUyksIHNpemVvZihm ZF9tYXNrKSk7DQorCWlmIChhbGxzb2NrID09IE5VTEwpDQorCQllcnJ4KDEs ICJjYWxsb2MiKTsNCisJRkRfU0VUKHNlcC0+c2VfZmQsIGFsbHNvY2spOw0K IH0NCiANCiB2b2lkDQpAQCAtMTQzMiw3ICsxNDc2LDcgQEANCiAJCSAgICAi JXM6ICVzOiBpcyBtdXgiLCBfX0ZVTkNUSU9OX18sIHNlcC0+c2Vfc2Vydmlj ZSk7DQogCQlleGl0KEVYX1NPRlRXQVJFKTsNCiAJfQ0KLQlpZiAoIUZEX0lT U0VUKHNlcC0+c2VfZmQsICZhbGxzb2NrKSkgew0KKwlpZiAoIUZEX0lTU0VU KHNlcC0+c2VfZmQsIGFsbHNvY2spKSB7DQogCQlzeXNsb2coTE9HX0VSUiwN CiAJCSAgICAiJXM6ICVzOiBub3Qgb24iLCBfX0ZVTkNUSU9OX18sIHNlcC0+ c2Vfc2VydmljZSk7DQogCQlleGl0KEVYX1NPRlRXQVJFKTsNCkBAIC0xNDQz LDcgKzE0ODcsNyBAQA0KIAl9DQogCW5zb2NrLS07DQogI2VuZGlmDQotCUZE X0NMUihzZXAtPnNlX2ZkLCAmYWxsc29jayk7DQorCUZEX0NMUihzZXAtPnNl X2ZkLCBhbGxzb2NrKTsNCiAJaWYgKHNlcC0+c2VfZmQgPT0gbWF4c29jaykN CiAJCW1heHNvY2stLTsNCiB9DQo= --0-1488729123-1000374360=:93735-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-audit" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.NEB.3.96L.1010913054252.93735A-200000>