From owner-svn-src-stable-7@FreeBSD.ORG Sun Jul 15 19:05:59 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 892A91065674; Sun, 15 Jul 2012 19:05:59 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 738DD8FC15; Sun, 15 Jul 2012 19:05:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6FJ5xcc066382; Sun, 15 Jul 2012 19:05:59 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6FJ5xW4066380; Sun, 15 Jul 2012 19:05:59 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201207151905.q6FJ5xW4066380@svn.freebsd.org> From: Jaakko Heinonen Date: Sun, 15 Jul 2012 19:05:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238497 - stable/7/sbin/mount_ntfs X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jul 2012 19:05:59 -0000 Author: jh Date: Sun Jul 15 19:05:58 2012 New Revision: 238497 URL: http://svn.freebsd.org/changeset/base/238497 Log: MFC r230642: Remove trailing whitespace. Modified: stable/7/sbin/mount_ntfs/mount_ntfs.c Directory Properties: stable/7/sbin/mount_ntfs/ (props changed) Modified: stable/7/sbin/mount_ntfs/mount_ntfs.c ============================================================================== --- stable/7/sbin/mount_ntfs/mount_ntfs.c Sun Jul 15 19:04:12 2012 (r238496) +++ stable/7/sbin/mount_ntfs/mount_ntfs.c Sun Jul 15 19:05:58 2012 (r238497) @@ -162,7 +162,7 @@ main(argc, argv) } /* - * Resolve the mountpoint with realpath(3) and remove unnecessary + * Resolve the mountpoint with realpath(3) and remove unnecessary * slashes from the devicename if there are any. */ (void)checkpath(dir, mntpath); From owner-svn-src-stable-7@FreeBSD.ORG Mon Jul 16 07:22:23 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 447191065670; Mon, 16 Jul 2012 07:22:23 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2F26D8FC17; Mon, 16 Jul 2012 07:22:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6G7MN6o014821; Mon, 16 Jul 2012 07:22:23 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6G7MMnf014819; Mon, 16 Jul 2012 07:22:22 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201207160722.q6G7MMnf014819@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Mon, 16 Jul 2012 07:22:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238517 - stable/7/sys/netinet6 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jul 2012 07:22:23 -0000 Author: bz Date: Mon Jul 16 07:22:22 2012 New Revision: 238517 URL: http://svn.freebsd.org/changeset/base/238517 Log: MFC r238248: Implement handling of "atomic fragements" as outlined in draft-gont-6man-ipv6-atomic-fragments to mitigate one class of possible fragmentation-based attacks. Modified: stable/7/sys/netinet6/frag6.c Directory Properties: stable/7/sys/ (props changed) Modified: stable/7/sys/netinet6/frag6.c ============================================================================== --- stable/7/sys/netinet6/frag6.c Mon Jul 16 07:08:34 2012 (r238516) +++ stable/7/sys/netinet6/frag6.c Mon Jul 16 07:22:22 2012 (r238517) @@ -209,6 +209,19 @@ frag6_input(struct mbuf **mp, int *offp, /* offset now points to data portion */ offset += sizeof(struct ip6_frag); + /* + * XXX-BZ RFC XXXX (draft-gont-6man-ipv6-atomic-fragments) + * Handle "atomic" fragments (offset and m bit set to 0) upfront, + * unrelated to any reassembly. Just skip the fragment header. + */ + if ((ip6f->ip6f_offlg & ~IP6F_RESERVED_MASK) == 0) { + /* XXX-BZ we want dedicated counters for this. */ + ip6stat.ip6s_reassembled++; + in6_ifstat_inc(dstifp, ifs6_reass_ok); + *offp = offset; + return (ip6f->ip6f_nxt); + } + IP6Q_LOCK(); /*