Date: Sat, 25 Jun 2005 17:13:18 -0500 (CDT) From: Mike Silbersack <silby@silby.com> To: Peter Holm <peter@holm.cc> Cc: current@freebsd.org, Thierry Herbelot <thierry@herbelot.com> Subject: Re: Mbuf double-free guilty party detection patch Message-ID: <20050625171206.S935@odysseus.silby.com> In-Reply-To: <20050625173217.GA24306@peter.osted.lan> References: <20050624212729.C537@odysseus.silby.com> <20050625133052.GA23599@peter.osted.lan> <1437.64.215.82.94.1119717536.squirrel@webmail2.pair.com> <20050625173217.GA24306@peter.osted.lan>
next in thread | previous 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. --0-1264224681-1119737598=:935 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Here's a fixed version of the patch that should return the correct address. I made two mistakes in the version I posted last night; that's what I get for testing, then making a few changes "that should work." I changed this version so that it doesn't panic, but continues on when it discovers the reuse of the mbuf. I figure this will make debugging less painful for everyone. :) Mike "Silby" Silbersack --0-1264224681-1119737598=:935 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=mbuf_trash_list_freeing_address-2.patch Content-Transfer-Encoding: BASE64 Content-ID: <20050625171318.I935@odysseus.silby.com> Content-Description: Content-Disposition: attachment; filename=mbuf_trash_list_freeing_address-2.patch ZGlmZiAtdSAtciAvdXNyL3NyYy9zeXMub2xkL2tlcm4vdWlwY19tYnVmLmMg L3Vzci9zcmMvc3lzL2tlcm4vdWlwY19tYnVmLmMNCi0tLSAvdXNyL3NyYy9z eXMub2xkL2tlcm4vdWlwY19tYnVmLmMJRnJpIEp1biAyNCAyMDoxMzo1OSAy MDA1DQorKysgL3Vzci9zcmMvc3lzL2tlcm4vdWlwY19tYnVmLmMJRnJpIEp1 biAyNCAyMDo1MDoxNiAyMDA1DQpAQCAtMjE5LDcgKzIxOSw3IEBADQogICog c3RvcmFnZSBhdHRhY2hlZCB0byB0aGVtIGlmIHRoZSByZWZlcmVuY2UgY291 bnQgaGl0cyAwLg0KICAqLw0KIHZvaWQNCi1tYl9mcmVlX2V4dChzdHJ1Y3Qg bWJ1ZiAqbSkNCittYl9mcmVlX2V4dChzdHJ1Y3QgbWJ1ZiAqbSwgdm9pZCAq YXJnKQ0KIHsNCiAJdV9pbnQgY250Ow0KIAlpbnQgZG9mcmVlOw0KQEAgLTI0 OSwxMCArMjQ5LDEwIEBADQogCQkgKiBEbyB0aGUgZnJlZSwgc2hvdWxkIGJl IHNhZmUuDQogCQkgKi8NCiAJCWlmIChtLT5tX2V4dC5leHRfdHlwZSA9PSBF WFRfUEFDS0VUKSB7DQotCQkJdW1hX3pmcmVlKHpvbmVfcGFjaywgbSk7DQor CQkJdW1hX3pmcmVlX2FyZyh6b25lX3BhY2ssIG0sIGFyZyk7DQogCQkJcmV0 dXJuOw0KIAkJfSBlbHNlIGlmIChtLT5tX2V4dC5leHRfdHlwZSA9PSBFWFRf Q0xVU1RFUikgew0KLQkJCXVtYV96ZnJlZSh6b25lX2NsdXN0LCBtLT5tX2V4 dC5leHRfYnVmKTsNCisJCQl1bWFfemZyZWVfYXJnKHpvbmVfY2x1c3QsIG0t Pm1fZXh0LmV4dF9idWYsIGFyZyk7DQogCQkJbS0+bV9leHQuZXh0X2J1ZiA9 IE5VTEw7DQogCQl9IGVsc2Ugew0KIAkJCSgqKG0tPm1fZXh0LmV4dF9mcmVl KSkobS0+bV9leHQuZXh0X2J1ZiwNCkBAIC0yNjYsNyArMjY2LDcgQEANCiAJ CQltLT5tX2V4dC5leHRfYnVmID0gTlVMTDsNCiAJCX0NCiAJfQ0KLQl1bWFf emZyZWUoem9uZV9tYnVmLCBtKTsNCisJdW1hX3pmcmVlX2FyZyh6b25lX21i dWYsIG0sIGFyZyk7DQogfQ0KIA0KIC8qDQpAQCAtMTM4MSw0ICsxMzgxLDE5 IEBADQogCWlmIChtX2ZpbmFsKQ0KIAkJbV9mcmVlbShtX2ZpbmFsKTsNCiAJ cmV0dXJuIChOVUxMKTsNCit9DQorDQorc3RydWN0IG1idWYgKg0KK21fZnJl ZShzdHJ1Y3QgbWJ1ZiAqbSkNCit7DQorICAgICAgICBzdHJ1Y3QgbWJ1ZiAq biA9IG0tPm1fbmV4dDsNCisgDQorI2lmZGVmIElOVkFSSUFOVFMNCisgICAg ICAgIG0tPm1fZmxhZ3MgfD0gTV9GUkVFTElTVDsNCisjZW5kaWYNCisgICAg ICAgIGlmIChtLT5tX2ZsYWdzICYgTV9FWFQpDQorICAgICAgICAgICAgICAg IG1iX2ZyZWVfZXh0KG0sIF9fYnVpbHRpbl9yZXR1cm5fYWRkcmVzcygwKSk7 DQorICAgICAgICBlbHNlDQorICAgICAgICAgICAgICAgIHVtYV96ZnJlZV9h cmcoem9uZV9tYnVmLCBtLCBfX2J1aWx0aW5fcmV0dXJuX2FkZHJlc3MoMCkp Ow0KKyAgICAgICAgcmV0dXJuIG47DQogfQ0KZGlmZiAtdSAtciAvdXNyL3Ny Yy9zeXMub2xkL3N5cy9tYnVmLmggL3Vzci9zcmMvc3lzL3N5cy9tYnVmLmgN Ci0tLSAvdXNyL3NyYy9zeXMub2xkL3N5cy9tYnVmLmgJRnJpIEp1biAyNCAy MDoxNzozMSAyMDA1DQorKysgL3Vzci9zcmMvc3lzL3N5cy9tYnVmLmgJRnJp IEp1biAyNCAyMDo1MzowNyAyMDA1DQpAQCAtMzUwLDEwICszNTAsMTAgQEAN CiBzdGF0aWMgX19pbmxpbmUgc3RydWN0IG1idWYJKm1fZ2V0aGRyKGludCBo b3csIHNob3J0IHR5cGUpOw0KIHN0YXRpYyBfX2lubGluZSBzdHJ1Y3QgbWJ1 ZgkqbV9nZXRjbChpbnQgaG93LCBzaG9ydCB0eXBlLCBpbnQgZmxhZ3MpOw0K IHN0YXRpYyBfX2lubGluZSBzdHJ1Y3QgbWJ1ZgkqbV9nZXRjbHIoaW50IGhv dywgc2hvcnQgdHlwZSk7CS8qIFhYWCAqLw0KLXN0YXRpYyBfX2lubGluZSBz dHJ1Y3QgbWJ1ZgkqbV9mcmVlKHN0cnVjdCBtYnVmICptKTsNCitzdHJ1Y3Qg bWJ1ZiAgICAgKm1fZnJlZShzdHJ1Y3QgbWJ1ZiAqbSk7DQogc3RhdGljIF9f aW5saW5lIHZvaWQJCSBtX2NsZ2V0KHN0cnVjdCBtYnVmICptLCBpbnQgaG93 KTsNCiBzdGF0aWMgX19pbmxpbmUgdm9pZAkJIG1fY2h0eXBlKHN0cnVjdCBt YnVmICptLCBzaG9ydCBuZXdfdHlwZSk7DQotdm9pZAkJCQkgbWJfZnJlZV9l eHQoc3RydWN0IG1idWYgKik7DQordm9pZAkJCQkgbWJfZnJlZV9leHQoc3Ry dWN0IG1idWYgKiwgdm9pZCAqYXJnKTsNCiANCiBzdGF0aWMgX19pbmxpbmUN CiBzdHJ1Y3QgbWJ1ZiAqDQpAQCAtNDA0LDcgKzQwNCw4IEBADQogCXJldHVy biAodW1hX3phbGxvY19hcmcoem9uZV9wYWNrLCAmYXJncywgaG93KSk7DQog fQ0KIA0KLXN0YXRpYyBfX2lubGluZQ0KKyNpZiAwDQorc3RhdGljDQogc3Ry dWN0IG1idWYgKg0KIG1fZnJlZShzdHJ1Y3QgbWJ1ZiAqbSkNCiB7DQpAQCAt NDE0LDExICs0MTUsMTIgQEANCiAJbS0+bV9mbGFncyB8PSBNX0ZSRUVMSVNU Ow0KICNlbmRpZg0KIAlpZiAobS0+bV9mbGFncyAmIE1fRVhUKQ0KLQkJbWJf ZnJlZV9leHQobSk7DQorCQltYl9mcmVlX2V4dChtLCBfX2J1aWx0aW5fcmV0 dXJuX2FkZHJlc3MoMCkpOw0KIAllbHNlDQotCQl1bWFfemZyZWUoem9uZV9t YnVmLCBtKTsNCisJCXVtYV96ZnJlZV9hcmcoem9uZV9tYnVmLCBtLCBfX2J1 aWx0aW5fcmV0dXJuX2FkZHJlc3MoMCkpOw0KIAlyZXR1cm4gbjsNCiB9DQor I2VuZGlmDQogDQogc3RhdGljIF9faW5saW5lDQogdm9pZA0KZGlmZiAtdSAt ciAvdXNyL3NyYy9zeXMub2xkL3ZtL3VtYV9kYmcuYyAvdXNyL3NyYy9zeXMv dm0vdW1hX2RiZy5jDQotLS0gL3Vzci9zcmMvc3lzLm9sZC92bS91bWFfZGJn LmMJRnJpIEp1biAyNCAyMDoxMzoyNyAyMDA1DQorKysgL3Vzci9zcmMvc3lz L3ZtL3VtYV9kYmcuYwlTYXQgSnVuIDI1IDE2OjUxOjQyIDIwMDUNCkBAIC02 NCwxMyArNjQsMTkgQEANCiB7DQogCWludCBjbnQ7DQogCXVfaW50MzJfdCAq cDsNCisJaW50ICpwdHI7DQogDQogCWNudCA9IHNpemUgLyBzaXplb2YodW1h X2p1bmspOw0KKwljbnQtLTsNCisJcHRyID0gbWVtOw0KKwlwdHIgKz0gY250 Ow0KIA0KIAlmb3IgKHAgPSBtZW07IGNudCA+IDA7IGNudC0tLCBwKyspDQot CQlpZiAoKnAgIT0gdW1hX2p1bmspDQotCQkJcGFuaWMoIk1lbW9yeSBtb2Rp ZmllZCBhZnRlciBmcmVlICVwKCVkKSB2YWw9JXggQCAlcFxuIiwNCisJCWlm ICgqcCAhPSB1bWFfanVuaykgew0KKwkJCXByaW50ZigiVGhpcyBtZW1vcnkg bGFzdCBmcmVlZCBieTogJXhcbiIsICpwdHIpOw0KKwkJCXByaW50ZigiTWVt b3J5IG1vZGlmaWVkIGFmdGVyIGZyZWUgJXAoJWQpIHZhbD0leCBAICVwXG4i LA0KIAkJCSAgICBtZW0sIHNpemUsICpwLCBwKTsNCisJCX0NCiAJcmV0dXJu ICgwKTsNCiB9DQogDQpAQCAtODcsOSArOTMsMTEgQEANCiAJdV9pbnQzMl90 ICpwOw0KIA0KIAljbnQgPSBzaXplIC8gc2l6ZW9mKHVtYV9qdW5rKTsNCisJ Y250LS07DQogDQogCWZvciAocCA9IG1lbTsgY250ID4gMDsgY250LS0sIHAr KykNCiAJCSpwID0gdW1hX2p1bms7DQorCSpwID0gKGludClhcmc7DQogfQ0K IA0KIC8qDQo= --0-1264224681-1119737598=:935--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050625171206.S935>