linux-kernel - [PATCH] scripts/setlocalversion: fix false positive -dirty tag from ctime

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <1426028589-28403-1-git-send-email-gregory.0xf0@gmail.com>
Date:	Tue, 10 Mar 2015 16:03:09 -0700
From:	Gregory Fong <gregory.0xf0@...il.com>
To:	linux-kernel@...r.kernel.org
Cc:	Michal Marek <mmarek@...e.cz>,
	Gregory Fong <gregory.0xf0@...il.com>
Subject: [PATCH] scripts/setlocalversion: fix false positive -dirty tag from ctime

git-diff-index cannot detect that a file hasn't actually changed when the
file's ctime has changed (e.g. if chmod was used but didn't actually result in
any changes), which was causing setlocalversion to incorrectly add a -dirty
tag.  Run git-update-index beforehand to make sure that the index is correct.

Signed-off-by: Gregory Fong <gregory.0xf0@...il.com>
---
Quick test:
  make defconfig
  make prepare
  chmod u+w Kbuild  # any chmod that doesn't result in a change will do
  CONFIG_LOCALVERSION_AUTO=y /bin/sh scripts/setlocalversion $PWD | grep -q dirty && echo "FAIL" || echo "OK" 

 scripts/setlocalversion | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 63d91e2..9e97364 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -45,6 +45,8 @@ scm_version()
 	# Check for git and a git repo.
 	if test -z "$(git rev-parse --show-cdup 2>/dev/null)" &&
 	   head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
+		# Update the index
+		git update-index -q --refresh
 
 		# If we are at a tagged commit (like "v2.6.30-rc6"), we ignore
 		# it, because this version is defined in the top level Makefile.
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/