From a8f77c1f66bdc9fc10539f9cee6c1231856bbd86 Mon Sep 17 00:00:00 2001
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 11 Feb 2012 11:11:13 +0000
Subject: [PATCH] Set read buffer size to multiple of sizeof(struct futx).

If the utmpx database gets updated while an application is reading it,
there is a chance the reading application processes partially
overwritten entries. To solve this, make sure we always read a multiple
of sizeof(struct futx) at a time.

MFC after:	2 weeks
---
 lib/libc/gen/getutxent.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/libc/gen/getutxent.c b/lib/libc/gen/getutxent.c
index 556df56220ed..4e608687795f 100644
--- a/lib/libc/gen/getutxent.c
+++ b/lib/libc/gen/getutxent.c
@@ -70,13 +70,18 @@ setutxdb(int db, const char *file)
 	if (uf == NULL)
 		return (-1);
 
-	/* Safety check: never use broken files. */
-	if (db != UTXDB_LOG && _fstat(fileno(uf), &sb) != -1 &&
-	    sb.st_size % sizeof(struct futx) != 0) {
-		fclose(uf);
-		uf = NULL;
-		errno = EFTYPE;
-		return (-1);
+	if (db != UTXDB_LOG) {
+		/* Safety check: never use broken files. */
+		if (_fstat(fileno(uf), &sb) != -1 &&
+		    sb.st_size % sizeof(struct futx) != 0) {
+			fclose(uf);
+			uf = NULL;
+			errno = EFTYPE;
+			return (-1);
+		}
+		/* Prevent reading of partial records. */
+		(void)setvbuf(uf, NULL, _IOFBF,
+		    rounddown(BUFSIZ, sizeof(struct futx)));
 	}
 
 	udb = db;