From owner-svn-src-releng@FreeBSD.ORG  Tue Apr  2 19:33:36 2013
Return-Path: <owner-svn-src-releng@FreeBSD.ORG>
Delivered-To: svn-src-releng@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 18391424;
 Tue,  2 Apr 2013 19:33:36 +0000 (UTC)
 (envelope-from gavin@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 0A697303;
 Tue,  2 Apr 2013 19:33:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r32JXZEC024035;
 Tue, 2 Apr 2013 19:33:35 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r32JXZqg024034;
 Tue, 2 Apr 2013 19:33:35 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201304021933.r32JXZqg024034@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Tue, 2 Apr 2013 19:33:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r249031 - releng/8.4/lib/libc/stdlib
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Apr 2013 19:33:36 -0000

Author: gavin
Date: Tue Apr  2 19:33:35 2013
New Revision: 249031
URL: http://svnweb.freebsd.org/changeset/base/249031

Log:
  When r241373 was merged, one file appears to have been missed from the
  commit.  Merge it:
          Remove undefined behavior from sranddev() and
          srandomdev(). This doesn't actually work
          with any modern C compiler:
  
          In particular, both clang and modern gcc
          verisons silently elide any xor operation
          with 'junk'.
  
  No mergeinfo changes with this commit as r241475 already updated the
  mergeinfo.
  
  Approved by:	re (jpaetzel)

Modified:
  releng/8.4/lib/libc/stdlib/random.c

Modified: releng/8.4/lib/libc/stdlib/random.c
==============================================================================
--- releng/8.4/lib/libc/stdlib/random.c	Tue Apr  2 19:07:11 2013	(r249030)
+++ releng/8.4/lib/libc/stdlib/random.c	Tue Apr  2 19:33:35 2013	(r249031)
@@ -315,10 +315,9 @@ srandomdev()
 
 	if (!done) {
 		struct timeval tv;
-		unsigned long junk;
 
 		gettimeofday(&tv, NULL);
-		srandom((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec ^ junk);
+		srandom((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec);
 		return;
 	}