From owner-svn-src-all@FreeBSD.ORG  Mon Jan  6 12:40:47 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4BF429C6;
 Mon,  6 Jan 2014 12:40:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 382481D29;
 Mon,  6 Jan 2014 12:40:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s06Celhf040520;
 Mon, 6 Jan 2014 12:40:47 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s06CelN1040519;
 Mon, 6 Jan 2014 12:40:47 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201401061240.s06CelN1040519@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 6 Jan 2014 12:40:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260367 - head/sys/rpc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jan 2014 12:40:47 -0000

Author: mav
Date: Mon Jan  6 12:40:46 2014
New Revision: 260367
URL: http://svnweb.freebsd.org/changeset/base/260367

Log:
  Fix NULL dereference panic on UDP requests introduced in r260229.

Modified:
  head/sys/rpc/svc.h

Modified: head/sys/rpc/svc.h
==============================================================================
--- head/sys/rpc/svc.h	Mon Jan  6 12:28:35 2014	(r260366)
+++ head/sys/rpc/svc.h	Mon Jan  6 12:40:46 2014	(r260367)
@@ -411,7 +411,7 @@ struct svc_req {
 	(*(xprt)->xp_ops->xp_stat)(xprt)
 
 #define SVC_ACK(xprt, ack)				\
-	((xprt)->xp_ops->xp_stat == NULL ? FALSE :	\
+	((xprt)->xp_ops->xp_ack == NULL ? FALSE :	\
 	    ((ack) == NULL ? TRUE : (*(xprt)->xp_ops->xp_ack)((xprt), (ack))))
 
 #define SVC_REPLY(xprt, msg, addr, m, seq)			\