From owner-freebsd-fs@FreeBSD.ORG Wed Dec 10 23:44:33 2014 Return-Path: Delivered-To: freebsd-fs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F5C46A3 for ; Wed, 10 Dec 2014 23:44:33 +0000 (UTC) Received: from styx.niksun.com (styx.niksun.com [24.104.71.38]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.niksun.com", Issuer "Go Daddy Secure Certification Authority" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5EE28838 for ; Wed, 10 Dec 2014 23:44:32 +0000 (UTC) Received: from EXCHANGE2013B.mj.niksun.com (10.25.8.16) by EXCHANGE2013B.mj.niksun.com (10.25.8.16) with Microsoft SMTP Server (TLS) id 15.0.913.22; Wed, 10 Dec 2014 18:44:31 -0500 Received: from EXCHANGE2010A.mj.niksun.com (10.25.8.13) by EXCHANGE2013B.mj.niksun.com (10.25.8.16) with Microsoft SMTP Server (TLS) id 15.0.913.22 via Frontend Transport; Wed, 10 Dec 2014 18:44:31 -0500 Received: from EXCHANGE2010B.mj.niksun.com ([fe80::ad15:5c17:ae01:8987]) by Exchange2010A.mj.niksun.com ([fe80::7800:5f61:4ee0:b983%15]) with mapi id 14.03.0174.001; Wed, 10 Dec 2014 18:44:31 -0500 From: Andrew Heybey To: Zaphod Beeblebrox Subject: Re: ZDB -Z? Thread-Topic: ZDB -Z? Thread-Index: AQHQCBd0emIa1APXW0+LZMI2Y/3KE5yIDswAgAGs0ICAAAh6gIAAJgeA Date: Wed, 10 Dec 2014 23:44:29 +0000 Message-ID: <938AF764-051D-4565-B124-12F28E5CB675@niksun.com> References: <54879274.5010001@niksun.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.24.4.176] Content-Type: text/plain; charset="us-ascii" Content-ID: <5DC839E7F0131B4588E6EA2B3372879C@niksun.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Cc: freebsd-fs X-BeenThere: freebsd-fs@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Filesystems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2014 23:44:33 -0000 On Dec 10, 2014, at 4:28 PM, Andrew Heybey wrote: >=20 > On Dec 10, 2014, at 3:58 PM, Zaphod Beeblebrox wrote: >>=20 >> I tried applying the patch to 10.1 and to -CURRENT (11) ... and I get: >>=20 >> [2:9:309]root@test-c1:/usr/src/cddl/contrib/opensolaris/cmd/zdb> patch <= ~dgilbert/zdb-z-patch >> Hmm... Looks like a unified diff to me... >> The text leading up to this was: >> -------------------------- >> |diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb.c b/cddl/contrib/open= solaris/cmd/zdb/zdb.c >> |index c265c99..bf43ea1 100644 >> |--- a/cddl/contrib/opensolaris/cmd/zdb/zdb.c >> |+++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.c >> -------------------------- >> Patching file zdb.c using Plan A... >> Hunk #1 succeeded at 59. >> Hunk #2 succeeded at 3085 with fuzz 1 (offset 339 lines). >> Hunk #3 succeeded at 3305 with fuzz 2 (offset 339 lines). >> Hunk #4 succeeded at 3329 with fuzz 2 (offset 339 lines). >> Hunk #5 failed at 3408. >> Hunk #6 failed at 3644. >> Hunk #7 failed at 3659. >> Hunk #8 failed at 3718. >> Hunk #9 failed at 3849. >> 5 out of 9 hunks failed--saving rejects to zdb.c.rej >> done >>=20 >> ... what version of FreeBSD is this patch against? >=20 > It is against tip of releng/10.0 as of Sep 16. Last commit before my pat= ch was: >=20 > Author: delphij > Date: Tue Sep 16 09:50:19 2014 +0000 >=20 > Fix Denial of Service in TCP packet processing. >=20 > Security: FreeBSD-SA-14:19.tcp > Approved by: so >=20 > which is SVN revision r271669 as far as I can tell. >=20 > What does the .rej file tell you? You reminded me that I want to upgrade this box to 10.1 anyway. I merged m= y patch to releng/10.1 (merge was trivial though I have not compiled it yet= ). I put the diff on pastebin to avoid line wrap and other possible damage in = email. http://pastebin.com/ThyeNHYE andrew