From owner-svn-src-head@FreeBSD.ORG Mon Apr 15 11:49:17 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7AAEF829; Mon, 15 Apr 2013 11:49:17 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6DC0AAA9; Mon, 15 Apr 2013 11:49:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3FBnHcw099021; Mon, 15 Apr 2013 11:49:17 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3FBnHCO099020; Mon, 15 Apr 2013 11:49:17 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201304151149.r3FBnHCO099020@svn.freebsd.org> From: Luigi Rizzo Date: Mon, 15 Apr 2013 11:49:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249504 - head/sys/dev/netmap X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Apr 2013 11:49:17 -0000 Author: luigi Date: Mon Apr 15 11:49:16 2013 New Revision: 249504 URL: http://svnweb.freebsd.org/changeset/base/249504 Log: fix a bug in the computation of the userspace offset for a give netmap buffer. Submitted by: Hugh Nhan Modified: head/sys/dev/netmap/netmap_mem2.c Modified: head/sys/dev/netmap/netmap_mem2.c ============================================================================== --- head/sys/dev/netmap/netmap_mem2.c Mon Apr 15 07:01:20 2013 (r249503) +++ head/sys/dev/netmap/netmap_mem2.c Mon Apr 15 11:49:16 2013 (r249504) @@ -278,7 +278,7 @@ netmap_obj_offset(struct netmap_obj_pool const char *base = p->lut[i].vaddr; ssize_t relofs = (const char *) vaddr - base; - if (relofs < 0 || relofs > p->_clustsize) + if (relofs < 0 || relofs >= p->_clustsize) continue; ofs = ofs + relofs;