bippy: fix up and allow -rc kernels to count

We need that for the logic.

Also add initial support for listing the files affected, but that
doesn't seem to be working properly, so don't add it to the json file
just yet, but add it to the mbox.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 19 insertions, 6 deletions

diff --git a/scripts/bippy b/scripts/bippy
index b6e7ce8d..e63f5ae1 100755
--- a/scripts/bippy
+++ b/scripts/bippy
@@ -511,12 +511,13 @@ for fixed_entry in ${fixed_kernels[@]}; do
 		continue
 	fi
 
-	# We do not care about fixes in -rc kernels, they will show up when the
-	# fix makes it to mainline.
-	if [[ "${fixed_entry_rc}" == "1" ]] ; then
-		dbg "${fixed_entry} is -rc"
-		continue
-	fi
+	# We do care about fixes in -rc kernels, as that is "mainline" and the
+	# logic of "affected/unaffected" depends on having a mainline commit,
+	# so that is why the following check is commented out on purpose.
+	#	if [[ "${fixed_entry_rc}" == "1" ]] ; then
+	#		dbg "${fixed_entry} is -rc"
+	#		continue
+	#	fi
 
 	# If we do not know what the root release is, then just create the pair
 	if [[ "${og_vuln}" == "0" ]] ; then
@@ -888,6 +889,18 @@ will be updated if fixes are backported, please check that for the most
 up to date information about this issue.
 
 
+Affected files
+==============
+
+The file(s) affected by this issue are:
+EOF
+	while IFS= read -r entry; do
+		echo "	${entry}" >> "${MBOX_FILE}"
+	done <<< "${files}"
+
+	cat << EOF >> "${MBOX_FILE}"
+
+
 Mitigation
 ==========