From owner-svn-src-all@FreeBSD.ORG Mon Oct 13 18:45:00 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73ABF1065692; Mon, 13 Oct 2008 18:45:00 +0000 (UTC) (envelope-from csjp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6151D8FC19; Mon, 13 Oct 2008 18:45:00 +0000 (UTC) (envelope-from csjp@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9DIixJB083548; Mon, 13 Oct 2008 18:44:59 GMT (envelope-from csjp@svn.freebsd.org) Received: (from csjp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9DIixJ8083547; Mon, 13 Oct 2008 18:44:59 GMT (envelope-from csjp@svn.freebsd.org) Message-Id: <200810131844.m9DIixJ8083547@svn.freebsd.org> From: "Christian S.J. Peron" Date: Mon, 13 Oct 2008 18:44:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r183837 - in releng/6.4/sys: . netinet/libalias X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Oct 2008 18:45:00 -0000 Author: csjp Date: Mon Oct 13 18:44:59 2008 New Revision: 183837 URL: http://svn.freebsd.org/changeset/base/183837 Log: MFC change 182488 Improve entropy in source port generation for libalias consumers. Approved by: re (kib) Modified: releng/6.4/sys/ (props changed) releng/6.4/sys/netinet/libalias/alias_db.c Modified: releng/6.4/sys/netinet/libalias/alias_db.c ============================================================================== --- releng/6.4/sys/netinet/libalias/alias_db.c Mon Oct 13 18:42:25 2008 (r183836) +++ releng/6.4/sys/netinet/libalias/alias_db.c Mon Oct 13 18:44:59 2008 (r183837) @@ -603,7 +603,7 @@ GetNewPort(struct libalias *la, struct a port_sys = ntohs(port_net); } else { /* First trial and all subsequent are random. */ - port_sys = random() & ALIAS_PORT_MASK; + port_sys = arc4random() & ALIAS_PORT_MASK; port_sys += ALIAS_PORT_BASE; port_net = htons(port_sys); } @@ -654,7 +654,7 @@ GetNewPort(struct libalias *la, struct a } #endif } - port_sys = random() & ALIAS_PORT_MASK; + port_sys = arc4random() & ALIAS_PORT_MASK; port_sys += ALIAS_PORT_BASE; port_net = htons(port_sys); } @@ -767,9 +767,9 @@ FindNewPortGroup(struct libalias *la, /* First trial and all subsequent are random. */ if (align == FIND_EVEN_ALIAS_BASE) - port_sys = random() & ALIAS_PORT_MASK_EVEN; + port_sys = arc4random() & ALIAS_PORT_MASK_EVEN; else - port_sys = random() & ALIAS_PORT_MASK; + port_sys = arc4random() & ALIAS_PORT_MASK; port_sys += ALIAS_PORT_BASE; } @@ -791,9 +791,9 @@ FindNewPortGroup(struct libalias *la, /* Find a new base to try */ if (align == FIND_EVEN_ALIAS_BASE) - port_sys = random() & ALIAS_PORT_MASK_EVEN; + port_sys = arc4random() & ALIAS_PORT_MASK_EVEN; else - port_sys = random() & ALIAS_PORT_MASK; + port_sys = arc4random() & ALIAS_PORT_MASK; port_sys += ALIAS_PORT_BASE; }