From owner-svn-src-head@FreeBSD.ORG  Wed Jul 24 16:22:27 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D93EB62C;
 Wed, 24 Jul 2013 16:22:27 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
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 C6CEC2B92;
 Wed, 24 Jul 2013 16:22:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6OGMR3W034203;
 Wed, 24 Jul 2013 16:22:27 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6OGMRGO034202;
 Wed, 24 Jul 2013 16:22:27 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201307241622.r6OGMRGO034202@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Wed, 24 Jul 2013 16:22:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253615 - head/sys/kern
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jul 2013 16:22:27 -0000

Author: marcel
Date: Wed Jul 24 16:22:27 2013
New Revision: 253615
URL: http://svnweb.freebsd.org/changeset/base/253615

Log:
  In uuid_ether_add(), avoid false positives due to the limited type
  used to hold the sum of the bytes of the MAC address. While here,
  rename the variable that holds the sum from 'c' to 'sum'.
  
  Pointed out by: thompsa@

Modified:
  head/sys/kern/kern_uuid.c

Modified: head/sys/kern/kern_uuid.c
==============================================================================
--- head/sys/kern/kern_uuid.c	Wed Jul 24 15:46:49 2013	(r253614)
+++ head/sys/kern/kern_uuid.c	Wed Jul 24 16:22:27 2013	(r253615)
@@ -200,8 +200,7 @@ sys_uuidgen(struct thread *td, struct uu
 int
 uuid_ether_add(const uint8_t *addr)
 {
-	int i;
-	uint8_t c;
+	int i, sum;
 
 	/*
 	 * Validate input. No multicast addresses and no addresses that
@@ -209,10 +208,10 @@ uuid_ether_add(const uint8_t *addr)
 	 */
 	if (addr[0] & 0x01)
 		return (EINVAL);
-	c = 0;
+	sum = 0;
 	for (i = 0; i < UUID_NODE_LEN; i++)
-		c += addr[i];
-	if (c == 0)
+		sum += addr[i];
+	if (sum == 0)
 		return (EINVAL);
 
 	mtx_lock(&uuid_mutex);