From owner-freebsd-bugs@FreeBSD.ORG Mon Dec 29 09:23:28 2003 Return-Path: Delivered-To: freebsd-bugs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8970D16A4CE for ; Mon, 29 Dec 2003 09:23:28 -0800 (PST) Received: from mail.vzletka.net (mail.vzletka.net [80.255.136.236]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2451543D1F for ; Mon, 29 Dec 2003 09:23:25 -0800 (PST) (envelope-from brj@vzletka.net) Received: by mail.vzletka.net (Postfix, from userid 1000) id B6FDBCBB4; Tue, 30 Dec 2003 00:23:16 +0700 (KRAT) Received: from 80.255.136.203 (metallservis.com.ru [80.255.136.203]) by mail.vzletka.net (Postfix) with ESMTP id 1EDB3CBB8 for ; Tue, 30 Dec 2003 00:23:11 +0700 (KRAT) Date: Tue, 30 Dec 2003 00:23:11 +0700 From: "Roman Y. Bogdanov" X-Mailer: The Bat! (v1.61) Personal Organization: vzletka.net security X-Priority: 3 (Normal) Message-ID: <52609734843.20031230002311@vzletka.net> To: freebsd-bugs@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----------9B1E8158361E9DC5" Subject: http://www.freebsd.org/cgi/query-pr.cgi?pr=60293 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Roman Y. Bogdanov" List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Dec 2003 17:23:28 -0000 ------------9B1E8158361E9DC5 Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 8bit http://www.freebsd.org/cgi/query-pr.cgi?pr=60293 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= From: Maxim Artemev To: brj@vzletka.net Date: Monday, December 29, 2003, 11:40:25 PM Subject: kern/60293: FreeBSD arp poison patch Files: if_ether.c.patch --====----====----====----====----====----====----====----====----====----===-- Hello. Here the updated patch (v1.2) for arp poison. Feautures: * Mark as 'static' entry only via sysctl variable. Not default as it was in old version. * Timeout of verifying. P.S. Can be forward to FreeBSD bugs team. --- WBR, Max Artemev úáï íã îôô, éÔÅÌ. íÏÓË×Á. http://www.ntt.ru/ [http://freecap.ru/] [http://theraccoons.ru/] =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -- Roman Y. Bogdanov ------------9B1E8158361E9DC5 Content-Type: application/octet-stream; name="if_ether.c.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="if_ether.c.patch" LS0tIGlmX2V0aGVyLmMub3JpZwlNb24gRGVjICA4IDE0OjAxOjQ3IDIwMDMKKysrIGlmX2V0aGVy LmMJVHVlIERlYyAgOSAxMTozMDowNCAyMDAzCkBAIC00MCw2ICs0MCwxMCBAQAogICoJYWRkICJp bnVzZS9sb2NrIiBiaXQgKG9yIHJlZi4gY291bnQpIGFsb25nIHdpdGggdmFsaWQgYml0CiAgKi8K IAorLyoKKyAqIEFSUC1wb3Npb24gQW50aWRvdGUgY29kZSAoYykgMjAwMyBieSBCZXJ0IDxiZXJ0 QGZ1cnJ5LnJ1PgorICovCisKICNpbmNsdWRlICJvcHRfaW5ldC5oIgogI2luY2x1ZGUgIm9wdF9i ZGcuaCIKIApAQCAtODIsNiArODYsMTEgQEAKIHN0YXRpYyBpbnQgYXJwdF9rZWVwID0gKDIwKjYw KTsgLyogb25jZSByZXNvbHZlZCwgZ29vZCBmb3IgMjAgbW9yZSBtaW51dGVzICovCiBzdGF0aWMg aW50IGFycHRfZG93biA9IDIwOwkvKiBvbmNlIGRlY2xhcmVkIGRvd24sIGRvbid0IHNlbmQgZm9y IDIwIHNlYyAqLwogCitzdGF0aWMgaW50IGFycF9zZWN1cmUgPSAxOworc3RhdGljIGludCBhcnB0 X2RlYnVnID0gMDsKK3N0YXRpYyBpbnQgYXJwdF9zdGF0aWMgPSAwOworCisKIFNZU0NUTF9JTlQo X25ldF9saW5rX2V0aGVyX2luZXQsIE9JRF9BVVRPLCBwcnVuZV9pbnR2bCwgQ1RMRkxBR19SVywK IAkgICAmYXJwdF9wcnVuZSwgMCwgIiIpOwogU1lTQ1RMX0lOVChfbmV0X2xpbmtfZXRoZXJfaW5l dCwgT0lEX0FVVE8sIG1heF9hZ2UsIENUTEZMQUdfUlcsIApAQCAtOTYsNiArMTA1LDEwIEBACiAJ c3RydWN0CXJ0ZW50cnkgKmxhX3J0OwogCXN0cnVjdAltYnVmICpsYV9ob2xkOwkJLyogbGFzdCBw YWNrZXQgdW50aWwgcmVzb2x2ZWQvdGltZW91dCAqLwogCWxvbmcJbGFfYXNrZWQ7CQkvKiBsYXN0 IHRpbWUgd2UgUVVFUklFRCBmb3IgdGhpcyBhZGRyICovCisJbG9uZwlsYV9hY2s7CQkJLyogQXJw IHJlcGx5IGFja25vd2xlZGdlbWVudCBmbGFnICovCQorICAgICAgICB1X2NoYXIgIGNoZWNrX2V0 aFtFVEhFUl9BRERSX0xFTl07IC8qIE9yaWdpbmFsIE1BQyBhZGRyZXNzICovCisJdV9jaGFyICBu ZXdfZXRoW0VUSEVSX0FERFJfTEVOXTsgICAvKiBOZXcgTUFDIGFkZHJlc3MgKi8KKwlzdHJ1Y3Qg aW5fYWRkcgljaGVja19pcDsKICNkZWZpbmUgbGFfdGltZXIgbGFfcnQtPnJ0X3JteC5ybXhfZXhw aXJlIC8qIGRlbGV0aW9uIHRpbWUgaW4gc2Vjb25kcyAqLwogfTsKIApAQCAtMTE1LDYgKzEyOCwx OSBAQAogU1lTQ1RMX0lOVChfbmV0X2xpbmtfZXRoZXJfaW5ldCwgT0lEX0FVVE8sIHByb3h5YWxs LCBDVExGTEFHX1JXLAogCSAgICZhcnBfcHJveHlhbGwsIDAsICIiKTsKIAorLyogc3lzY3RsIGFy cCBhbnRpZG90ZSB2YXJpYWJsZS4gRGVmYXVsdCBpcyAib24iICovCitTWVNDVExfSU5UKF9uZXRf bGlua19ldGhlcl9pbmV0LCBPSURfQVVUTywgYXJwX2FudGlkb3RlLCBDVExGTEFHX1JXLAorCSAg ICZhcnBfc2VjdXJlLCAwLCAiRW5hYmxlIGFudGlkb3RlIGZvciBBUlAgcG9pc29uIik7CisJICAg CisvKiBzeXNjdGwgYXJwIGRlYnVnIHZhcmlhYmxlLiBEZWZhdWx0IGlzICJvZmYiICovCitTWVND VExfSU5UKF9uZXRfbGlua19ldGhlcl9pbmV0LCBPSURfQVVUTywgYXJwX2RlYnVnLCBDVExGTEFH X1JXLAorCSAgICZhcnB0X2RlYnVnLCAwLCAiRHVtcCBhcnAgcGFja2V0cyIpOworCisvKiBzeXNj dGwgYXJwIHN0YXRpYyB2YXJpYWJsZS4gRGVmYXVsdCBpcyAib2ZmIiAqLworU1lTQ1RMX0lOVChf bmV0X2xpbmtfZXRoZXJfaW5ldCwgT0lEX0FVVE8sIGFycF9zdGF0aWMsIENUTEZMQUdfUlcsCisg ICAgICAgICAgJmFycHRfc3RhdGljLCAwLCAiTWFrZSBBUlAgZW50cnkgc3RhdGljIGlmIHBvaXNv bmluZyBkZXRlY3RlZCIpOworCisKIHN0YXRpYyB2b2lkCWFycF9ydHJlcXVlc3QgX19QKChpbnQs IHN0cnVjdCBydGVudHJ5ICosIHN0cnVjdCBydF9hZGRyaW5mbyAqKSk7CiBzdGF0aWMgdm9pZAlh cnByZXF1ZXN0IF9fUCgoc3RydWN0IGlmbmV0ICosCiAJCQlzdHJ1Y3QgaW5fYWRkciAqLCBzdHJ1 Y3QgaW5fYWRkciAqLCB1X2NoYXIgKikpOwpAQCAtMTQ5LDggKzE3NSwxNCBAQAogCXdoaWxlICgo b2xhID0gbGEpICE9IDApIHsKIAkJcmVnaXN0ZXIgc3RydWN0IHJ0ZW50cnkgKnJ0ID0gbGEtPmxh X3J0OwogCQlsYSA9IGxhLT5sYV9sZS5sZV9uZXh0OwotCQlpZiAocnQtPnJ0X2V4cGlyZSAmJiBy dC0+cnRfZXhwaXJlIDw9IHRpbWVfc2Vjb25kKQotCQkJYXJwdGZyZWUob2xhKTsgLyogdGltZXIg aGFzIGV4cGlyZWQsIGNsZWFyICovCisJCWlmICgocnQtPnJ0X2V4cGlyZSAmJiBydC0+cnRfZXhw aXJlIDw9IHRpbWVfc2Vjb25kKSB8fCBvbGEtPmxhX2FjayA9PSAxKQorCQl7CisJCSAgICBpZiAo b2xhLT5sYV9hY2sgJiYgYXJwdF9kZWJ1ZykgeworCQkJbG9nKExPR19JTkZPLCAiYXJwOiBUaW1l b3V0IG9mIHZlcmlmeWluZyBmb3IgTUFDIGFkZHJlc3MgJSpELlxuIiwKKwkJCSAgICBzaXplb2Yo b2xhLT5uZXdfZXRoKSwgKHVfY2hhciAqKSZvbGEtPm5ld19ldGgsICI6Iik7CisJCSAgICB9CisJ CSAgICBhcnB0ZnJlZShvbGEpOyAvKiB0aW1lciBoYXMgZXhwaXJlZCwgY2xlYXIgKi8KKwkJfQog CX0KIAlzcGx4KHMpOwogfQpAQCAtNjYzLDE0ICs2OTUsNzcgQEAKIAkJCSAgICBpZnAtPmlmX25h bWUsIGlmcC0+aWZfdW5pdCk7CiAJCSAgICBnb3RvIHJlcGx5OwogCQl9CisJCQorCQkvKiBQcmlu dCBhbm5vdW5jZWQgcGFja2V0IGlmIGRlYnVnIGlzIGVuYWJsZWQgKi8KKwkJaWYgKHNkbC0+c2Rs X2FsZW4gJiYgYXJwdF9kZWJ1ZykgeworICAgICAgICAgICAgICAgICAgbG9nKExPR19JTkZPLCAi YXJwOiBHb3QgTUFDIGFkZHJlc3MgJSpEIGZyb20gJXMgdmlhICVzJWRcbiIsIAorCQkgICAgICBp ZnAtPmlmX2FkZHJsZW4sICh1X2NoYXIgKilhcl9zaGEoYWgpLCAiOiIsCisJCSAgICAgIGluZXRf bnRvYShpc2FkZHIpLAorCQkgICAgICBpZnAtPmlmX25hbWUsIGlmcC0+aWZfdW5pdCk7CisJCX0K KwkJCisJCQorCQlpZiAoYXJwX3NlY3VyZSAmJiBydC0+cnRfZXhwaXJlICYmIAorCQkgICBzZGwt PnNkbF9hbGVuICYmIGxhLT5sYV9hY2spIAorCQl7CisJCSAgICBpbnQgYl9lcXVhbHMgPSAoYmNt cChhcl9zaGEoYWgpLCAmbGEtPmNoZWNrX2V0aCwgc2RsLT5zZGxfYWxlbikgPT0gMCkgJiYKKyAg ICAgICAgCQkoYmNtcChhcl9zaGEoYWgpLCAmbGEtPm5ld19ldGgsIHNkbC0+c2RsX2FsZW4pID09 IDApOworCSAgIAkJCisJCSAgLyogQ2hlY2sgcG9zc2libGUgcmVwbHkgd2l0aCBvbGQgTUFDLWFk ZHJlc3MqLworCQkgIGlmIChiX2VxdWFscykgeworCQkgIC8qIEJvdGggYWRkcmVzc2VzIGFyZSBl cXVhbC4gTUFDIGFkZHJlc3MgdmVyaWZpZWQgKi8KKwkJICAgIGlmIChhcnB0X2RlYnVnKQorICAg ICAgICAgICAgICAgICAgICAgIGxvZyhMT0dfSU5GTywgImFycDogTUFDIGFkZHJlc3MgJSpEIGZy b20gJXMgdmVyaWZpZWQuXG4iLAorCQkgICAgICAgICAgaWZwLT5pZl9hZGRybGVuLCAodV9jaGFy ICopYXJfc2hhKGFoKSwgIjoiLAorCQkgICAgICAgICAgaW5ldF9udG9hKGlzYWRkcikpOworCQkg ICAgbGEtPmxhX2FjayA9IDA7CisJCSAgfSBlbHNlIHsKKwkJICAgIC8qIFJlcGx5IHdhcyB3aXRo IGFub3RoZXIgTUFDICovCisgICAgICAgICAgICAgICAgICAgIGxvZyhMT0dfRVJSLCAiYXJwOiBB UlAgcG9pc29uIGRldGVjdGVkISwgYXR0YWNrZXIgZnJvbSAlKkQgdHJ5aW5nIHRvIGluZmVjdCAl KkQgKCVzKSBpbiBteSBBUlAgdGFibGUhXG4iLAorCQkgICAgICBzZGwtPnNkbF9hbGVuLCAodV9j aGFyICopJmxhLT5uZXdfZXRoLCAiOiIsCisJCSAgICAgIHNkbC0+c2RsX2FsZW4sICh1X2NoYXIg KikmbGEtPmNoZWNrX2V0aCwgIjoiLAorCQkgICAgICBpbmV0X250b2EobGEtPmNoZWNrX2lwKSk7 CisJCSAgICAgaWYgKGFycHRfc3RhdGljKQorCQkgICAgICAgcnQtPnJ0X2V4cGlyZSA9IDA7CisJ CSAgICAgIAorCQkgICAgIC8qIENsZWFyIGNhY2hlZCBNQUMgKi8KKwkJICAgICBiemVybygmbGEt PmNoZWNrX2V0aCwgc2l6ZW9mKGxhLT5jaGVja19ldGgpKTsKKwkJICAgICBsYS0+bGFfYWNrID0g MDsgCisgICAgICAgICAgICAgICAgICAgICBtX2ZyZWUobSk7CisgICAgICAgICAgICAgICAgICAg ICByZXR1cm47CisJCSAgfQorCQl9CisJCQogCQlpZiAoc2RsLT5zZGxfYWxlbiAmJgogCQkgICAg YmNtcChhcl9zaGEoYWgpLCBMTEFERFIoc2RsKSwgc2RsLT5zZGxfYWxlbikpIHsKLQkJCWlmIChy dC0+cnRfZXhwaXJlKQotCQkJICAgIGxvZyhMT0dfSU5GTywgImFycDogJXMgbW92ZWQgZnJvbSAl KkQgdG8gJSpEIG9uICVzJWRcbiIsCi0JCQkJaW5ldF9udG9hKGlzYWRkciksCi0JCQkJaWZwLT5p Zl9hZGRybGVuLCAodV9jaGFyICopTExBRERSKHNkbCksICI6IiwKLQkJCQlpZnAtPmlmX2FkZHJs ZW4sICh1X2NoYXIgKilhcl9zaGEoYWgpLCAiOiIsCi0JCQkJaWZwLT5pZl9uYW1lLCBpZnAtPmlm X3VuaXQpOworCQkJaWYgKHJ0LT5ydF9leHBpcmUpIHsKKwkJCSAgICBpZiAoYXJwX3NlY3VyZSkg eworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGxhLT5sYV9hY2sgPT0gMCkgewor CQkJICAgICAgICBpZiAoYXJwdF9kZWJ1ZykKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBsb2coTE9HX0lORk8sICJhcnA6IEdvdCBuZXcgTUFDIGFkZHJlc3MgJSpEIGZyb20gJXMg KCVzJWQpLiBOb3cgdmVyaWZ5aW5nLlxuIiwKKwkJCQkgICAgICBpZnAtPmlmX2FkZHJsZW4sICh1 X2NoYXIgKilhcl9zaGEoYWgpLCAiOiIsCisJCQkJICAgICAgaW5ldF9udG9hKGlzYWRkciksCisJ CQkJICAgICAgaWZwLT5pZl9uYW1lLCBpZnAtPmlmX3VuaXQpOworCQkJCSAgLyogQ2hlY2sgb2xk IE1BQyBhZGRyZXNzIGZvciBhbGl2ZSAqLworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGFycHJlcXVlc3QoaWZwLCAmbXlhZGRyLCAmaXNhZGRyLCBJRl9MTEFERFIoaWZwKSk7CisJ CQkJICAodm9pZCltZW1jcHkoKHVfY2hhciAqKSZsYS0+Y2hlY2tfZXRoLCBMTEFERFIoc2RsKSwg c2RsLT5zZGxfYWxlbik7CisJCQkJICAodm9pZCltZW1jcHkoKHVfY2hhciAqKSZsYS0+bmV3X2V0 aCwgKHVfY2hhciAqKWFyX3NoYShhaCksIHNkbC0+c2RsX2FsZW4pOworCQkJCQorCQkJCSAgbGEt PmNoZWNrX2lwLnNfYWRkciA9IGlzYWRkci5zX2FkZHI7CisJCQkJCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbGEtPmxhX2FjaysrOworCQkJCSAgbGEtPmxhX2Fza2VkKys7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9mcmVlKG0pOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKwkJCSAgICAgIH0KKwkJCSAgICB9IGVsc2Ug eworCQkJICAgICAgIGxvZyhMT0dfSU5GTywgImFycDogJXMgbW92ZWQgZnJvbSAlKkQgdG8gJSpE IG9uICVzJWRcbiIsCisJCQkgICAgICAgICAgaW5ldF9udG9hKGlzYWRkciksCisJCQkgIAkgIGlm cC0+aWZfYWRkcmxlbiwgKHVfY2hhciAqKUxMQUREUihzZGwpLCAiOiIsCisJCQkJICBpZnAtPmlm X2FkZHJsZW4sICh1X2NoYXIgKilhcl9zaGEoYWgpLCAiOiIsCisJCQkJICBpZnAtPmlmX25hbWUs IGlmcC0+aWZfdW5pdCk7CisJCQkgICAgfQorCQkJfQogCQkJZWxzZSB7CiAJCQkgICAgbG9nKExP R19FUlIsCiAJCQkJImFycDogJSpEIGF0dGVtcHRzIHRvIG1vZGlmeSBwZXJtYW5lbnQgZW50cnkg Zm9yICVzIG9uICVzJWRcbiIsCg0K ------------9B1E8158361E9DC5--