Date: Tue, 8 May 2001 23:45:45 -0400 (EDT) From: "Andrew R. Reiter" <arr@watson.org> To: freebsd-audit@freebsd.org Subject: audit work: cmds.c from timedc Message-ID: <Pine.NEB.3.96L.1010508234228.79826A-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-575651080-989379945=:79826 Content-Type: TEXT/PLAIN; charset=US-ASCII Hey, The attached patch accounts for a few sync ups to openbsd... they are: - check the msg.tsp_type value prior to using it as an index into char *tsptype[] - use strlcpy's instead of strcpy's - & handle short packets properly. The patch can also be found at: http://www.watson.org/~arr/fbsd-audit/usr.sbin/timed/timedc/ comments appreciated Thanks, 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-575651080-989379945=:79826 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="cmds.c.05082001.diff" Content-Transfer-Encoding: BASE64 Content-ID: <Pine.NEB.3.96L.1010508234545.79826B@fledge.watson.org> Content-Description: LS0tIGNtZHMuYy5vcmlnCVR1ZSBNYXkgIDggMTk6NTI6MzggMjAwMQ0KKysr IGNtZHMuYwlUdWUgTWF5ICA4IDIwOjQwOjQwIDIwMDENCkBAIC0yNzcsNyAr Mjc3LDcgQEANCiAJZmRfc2V0IHJlYWR5Ow0KIAlzdHJ1Y3Qgc29ja2FkZHJf aW4gZGVzdDsNCiAJaW50IGksIGxlbmd0aDsNCi0Jc3RydWN0IHNvY2thZGRy IGZyb207DQorCXN0cnVjdCBzb2NrYWRkcl9pbiBmcm9tOw0KIAlzdHJ1Y3Qg dGltZXZhbCB0b3V0Ow0KIAlzdHJ1Y3QgdHNwIG1zZzsNCiAJc3RydWN0IHNl cnZlbnQgKnNydnA7DQpAQCAtMzA4LDcgKzMwOCw3IEBADQogCQl9DQogCQli Y29weShocC0+aF9hZGRyLCAmZGVzdC5zaW5fYWRkci5zX2FkZHIsIGhwLT5o X2xlbmd0aCk7DQogDQotCQkodm9pZClzdHJjcHkobXNnLnRzcF9uYW1lLCBt eW5hbWUpOw0KKwkJKHZvaWQpc3RybGNweShtc2cudHNwX25hbWUsIG15bmFt ZSwgc2l6ZW9mKG1zZy50c3BfbmFtZSkpOw0KIAkJbXNnLnRzcF90eXBlID0g VFNQX01TSVRFOw0KIAkJbXNnLnRzcF92ZXJzID0gVFNQVkVSU0lPTjsNCiAJ CWJ5dGVuZXRvcmRlcigmbXNnKTsNCkBAIC0zMjUsMjAgKzMyNSwzMSBAQA0K IAkJRkRfU0VUKHNvY2ssICZyZWFkeSk7DQogCQlpZiAoc2VsZWN0KEZEX1NF VFNJWkUsICZyZWFkeSwgKGZkX3NldCAqKTAsIChmZF9zZXQgKikwLA0KIAkJ CSAgICZ0b3V0KSkgew0KLQkJCWxlbmd0aCA9IHNpemVvZihzdHJ1Y3Qgc29j a2FkZHIpOw0KKwkJCWxlbmd0aCA9IHNpemVvZihmcm9tKTsNCiAJCQljYyA9 IHJlY3Zmcm9tKHNvY2ssICZtc2csIHNpemVvZihzdHJ1Y3QgdHNwKSwgMCwN Ci0JCQkJICAgICAgJmZyb20sICZsZW5ndGgpOw0KKwkJCQkgICAgICAoc3Ry dWN0IHNvY2thZGRyICopJmZyb20sICZsZW5ndGgpOw0KIAkJCWlmIChjYyA8 IDApIHsNCiAJCQkJd2FybigicmVjdmZyb20iKTsNCiAJCQkJY29udGludWU7 DQogCQkJfQ0KKwkJCWlmIChjYyA8IHNpemVvZihzdHJ1Y3QgdHNwKSkgew0K KwkJCQlmcHJpbnRmKHN0ZGVyciwgDQorCQkJCSAgICJzaG9ydCBwYWNrZXQg KCV1LyV1IGJ5dGVzKSBmcm9tICVzXG4iLA0KKwkJCQkgICBjYywgc2l6ZW9m KHN0cnVjdCB0c3ApLA0KKwkJCQkgICBpbmV0X250b2EoZnJvbS5zaW5fYWRk cikpOw0KKwkJCQljb250aW51ZTsNCisJCQl9DQogCQkJYnl0ZWhvc3RvcmRl cigmbXNnKTsNCiAJCQlpZiAobXNnLnRzcF90eXBlID09IFRTUF9BQ0spIHsN CiAJCQkJcHJpbnRmKCJtYXN0ZXIgdGltZWRhZW1vbiBhdCAlcyBpcyAlc1xu IiwNCiAJCQkJICAgICAgIHRndG5hbWUsIG1zZy50c3BfbmFtZSk7DQogCQkJ fSBlbHNlIHsNCi0JCQkJcHJpbnRmKCJyZWNlaXZlZCB3cm9uZyBhY2s6ICVz XG4iLA0KLQkJCQkgICAgICAgdHNwdHlwZVttc2cudHNwX3R5cGVdKTsNCisJ CQkJaWYgKG1zZy50c3BfdHlwZSA+PSBUU1BUWVBFTlVNQkVSDQorCQkJCQlw cmludGYoInVua25vd24gYWNrIHJlY2VpdmVkOiAldVxuIiwNCisJCQkJCQlt c2cudHNwX3R5cGUpOw0KKwkJCQllbHNlCQ0KKwkJCQkJcHJpbnRmKCJ3cm9u ZyBhY2sgcmVjZWl2ZWQ6ICVzXG4iLA0KKwkJCQkgICAgICAgCQl0c3B0eXBl W21zZy50c3BfdHlwZV0pOw0KIAkJCX0NCiAJCX0gZWxzZSB7DQogCQkJcHJp bnRmKCJjb21tdW5pY2F0aW9uIGVycm9yIHdpdGggJXNcbiIsIHRndG5hbWUp Ow0KQEAgLTM5Nyw3ICs0MDgsNyBAQA0KIAkJbXNnLnRzcF92ZXJzID0gVFNQ VkVSU0lPTjsNCiAJCWlmIChnZXRob3N0bmFtZShteW5hbWUsIHNpemVvZiht eW5hbWUpIC0gMSkgPCAwKQ0KIAkJCWVycigxLCAiZ2V0aG9zdG5hbWUiKTsN Ci0JCSh2b2lkKXN0cmNweShtc2cudHNwX25hbWUsIG15bmFtZSk7DQorCQko dm9pZClzdHJsY3B5KG1zZy50c3BfbmFtZSwgbXluYW1lLCBzaXplb2YobXNn LnRzcF9uYW1lKSk7DQogCQlieXRlbmV0b3JkZXIoJm1zZyk7DQogCQlpZiAo c2VuZHRvKHNvY2ssICZtc2csIHNpemVvZihzdHJ1Y3QgdHNwKSwgMCwNCiAJ CQkgICAoc3RydWN0IHNvY2thZGRyKikmc2luLA0KQEAgLTQyMSw3ICs0MzIs NyBAQA0KIAlpbnQgY2M7DQogCWZkX3NldCByZWFkeTsNCiAJc3RydWN0IHNv Y2thZGRyX2luIGRlc3Q7DQotCXN0cnVjdCBzb2NrYWRkciBmcm9tOw0KKwlz dHJ1Y3Qgc29ja2FkZHJfaW4gZnJvbTsNCiAJc3RydWN0IHRpbWV2YWwgdG91 dDsNCiAJc3RydWN0IHRzcCBtc2c7DQogCXN0cnVjdCBzZXJ2ZW50ICpzcnZw Ow0KQEAgLTQ2NiwyMiArNDc3LDMyIEBADQogCUZEX1pFUk8oJnJlYWR5KTsN CiAJRkRfU0VUKHNvY2ssICZyZWFkeSk7DQogCWlmIChzZWxlY3QoRkRfU0VU U0laRSwgJnJlYWR5LCAoZmRfc2V0ICopMCwgKGZkX3NldCAqKTAsICZ0b3V0 KSkgew0KLQkJbGVuZ3RoID0gc2l6ZW9mKHN0cnVjdCBzb2NrYWRkcik7DQor CQlsZW5ndGggPSBzaXplb2YoZnJvbSk7DQogCQljYyA9IHJlY3Zmcm9tKHNv Y2ssICZtc2csIHNpemVvZihzdHJ1Y3QgdHNwKSwgMCwNCi0JCQkgICAgICAm ZnJvbSwgJmxlbmd0aCk7DQorCQkJICAgICAgKHN0cnVjdCBzb2NrYWRkciAq KSZmcm9tLCAmbGVuZ3RoKTsNCiAJCWlmIChjYyA8IDApIHsNCiAJCQl3YXJu KCJyZWN2ZnJvbSIpOw0KIAkJCXJldHVybjsNCiAJCX0NCisJCWlmIChjYyA8 IHNpemVvZihzdHJ1Y3QgdHNwKSkgew0KKwkJCWZwcmludGYoc3RkZXJyLCAi c2hvcnQgcGFjayAoJXUvJXUgYnl0ZXMpIGZyb20gJXNcbiIsDQorCQkJICAg Y2MsIHNpemVvZihzdHJ1Y3QgdHNwKSwgaW5ldF9udG9hKGZyb20uc2luX2Fk ZHIpKTsNCisJCQlyZXR1cm47DQorCQl9DQogCQlieXRlaG9zdG9yZGVyKCZt c2cpOw0KIAkJaWYgKG1zZy50c3BfdHlwZSA9PSBUU1BfQUNLKQ0KIAkJCWlm IChvbmZsYWcpDQogCQkJCXByaW50ZigidGltZWQgdHJhY2luZyBlbmFibGVk XG4iKTsNCiAJCQllbHNlDQogCQkJCXByaW50ZigidGltZWQgdHJhY2luZyBk aXNhYmxlZFxuIik7DQotCQllbHNlDQotCQkJcHJpbnRmKCJ3cm9uZyBhY2sg cmVjZWl2ZWQ6ICVzXG4iLA0KKwkJZWxzZSB7DQorCQkJaWYgKG1zZy50c3Bf dHlwZSA+PSBUU1BUWVBFTlVNQkVSKQ0KKwkJCQlwcmludGYoInVua25vd24g YWNrIHJlY2VpdmVkOiAldVxuIiwNCisJCQkJCW1zZy50c3BfdHlwZSk7DQor CQkJZWxzZQkNCisJCQkJcHJpbnRmKCJ3cm9uZyBhY2sgcmVjZWl2ZWQ6ICVz XG4iLA0KIAkJCQkJCXRzcHR5cGVbbXNnLnRzcF90eXBlXSk7DQorCQl9DQog CX0gZWxzZQ0KIAkJcHJpbnRmKCJjb21tdW5pY2F0aW9uIGVycm9yXG4iKTsN CiB9DQo= --0-575651080-989379945=:79826-- 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.1010508234228.79826A-200000>