From owner-svn-src-stable@FreeBSD.ORG Wed Apr 25 09:55:34 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9664D1065676; Wed, 25 Apr 2012 09:55:34 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7FA2D8FC0C; Wed, 25 Apr 2012 09:55:34 +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 q3P9tYb5090643; Wed, 25 Apr 2012 09:55:34 GMT (envelope-from melifaro@svn.freebsd.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3P9tYhL090641; Wed, 25 Apr 2012 09:55:34 GMT (envelope-from melifaro@svn.freebsd.org) Message-Id: <201204250955.q3P9tYhL090641@svn.freebsd.org> From: "Alexander V. Chernikov" Date: Wed, 25 Apr 2012 09:55:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r234681 - stable/9/sys/netgraph X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Apr 2012 09:55:34 -0000 Author: melifaro Date: Wed Apr 25 09:55:34 2012 New Revision: 234681 URL: http://svn.freebsd.org/changeset/base/234681 Log: MFC r234574 Fix panic in ng_patch(4) caused by checksum flags being added to mbuf flags. Tested by: Maxim Ignatenko Approved by: ae(mentor) Modified: stable/9/sys/netgraph/ng_patch.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/netgraph/ng_patch.c ============================================================================== --- stable/9/sys/netgraph/ng_patch.c Wed Apr 25 07:27:13 2012 (r234680) +++ stable/9/sys/netgraph/ng_patch.c Wed Apr 25 09:55:34 2012 (r234681) @@ -517,7 +517,7 @@ ng_patch_rcvdata(hook_p hook, item_p ite return (ENOMEM); } do_patch(priv, m); - m->m_flags |= priv->config->csum_flags; + m->m_pkthdr.csum_flags |= priv->config->csum_flags; } target = NULL;