Merge pull request #223 from yizhanglinux/kmemleak-fix

check: fix kmemleak scan when DEBUG_KMEMLEAK_DEFAULT_OFF enabled

Author: kawasaki

check

@@ -183,27 +183,58 @@ _check_dmesg() {
 	fi
 }
 
-_setup_kmemleak() {
-	local f="/sys/kernel/debug/kmemleak"
+# Retrieve the value of kernel option $1.
+_get_kernel_option() {
+	local f opt=$1 result
+
+	for f in /proc/config.gz /boot/config-$(uname -r); do
+		[ -e "$f" ] || continue
+		if result=$(zgrep "^CONFIG_${opt}=" "$f"); then
+			echo "${result#*=}"
+			return 0
+		fi
+	done
 
-	if [[ ! -e $f || ! -r $f ]]; then
-		return 0
+	return 1
+}
+
+# Check if kernel option $1 is defined.
+_check_kernel_option() {
+	case "$(_get_kernel_option "$1")" in
+		y|m)
+			return 0;;
+	esac
+
+	return 1
+}
+
+declare KMEMLEAK=0
+declare KMEMLEAK_FILE=/sys/kernel/debug/kmemleak
+
+if _check_kernel_option DEBUG_KMEMLEAK && [[ -e $KMEMLEAK_FILE && -r $KMEMLEAK_FILE ]]; then
+	if _check_kernel_option DEBUG_KMEMLEAK_DEFAULT_OFF; then
+		if grep --quiet kmemleak=on /proc/cmdline; then
+			KMEMLEAK=1
+		fi
+	else
+		KMEMLEAK=1
 	fi
+fi
 
-	echo clear > "$f"
+_setup_kmemleak() {
+	if ((KMEMLEAK)) ;then
+		echo clear > "$KMEMLEAK_FILE"
+	fi
 }
 
 _check_kmemleak() {
 	local kmemleak
-	local f="/sys/kernel/debug/kmemleak"
 
-	if [[ ! -e $f || ! -r $f ]]; then
-		return 0
-	fi
+	((KMEMLEAK)) || return 0
 
-	echo scan > "$f"
+	echo scan > "$KMEMLEAK_FILE"
 	sleep 1
-	kmemleak=$(cat "$f")
+	kmemleak=$(cat "$KMEMLEAK_FILE")
 
 	if [[ -z $kmemleak ]]; then
 		return 0

common/rc

@@ -211,31 +211,6 @@ _have_kernel_config_file() {
 	return 0
 }
 
-# Retrieve the value of kernel option $1.
-_get_kernel_option() {
-	local f opt=$1 result
-
-	for f in /proc/config.gz /boot/config-$(uname -r); do
-		[ -e "$f" ] || continue
-		if result=$(zgrep "^CONFIG_${opt}=" "$f"); then
-			echo "${result#*=}"
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-# Check if kernel option $1 is defined.
-_check_kernel_option() {
-	case "$(_get_kernel_option "$1")" in
-		y|m)
-			return 0;;
-	esac
-
-	return 1
-}
-
 # Combine _have_kernel_config_file() and _check_kernel_option().
 # Set SKIP_REASONS when _check_kernel_option() returns false.
 _have_kernel_option() {