cve_push: Set the same topic for multi-part CVEs

Author: raymanfx

cve_push.py

@@ -178,9 +178,16 @@ def run(kernel_repo, input_file, gerrit_user, branch):
         # checkout the commit for the given CVE id
         cmd = ["git", "-C", kernel_repo, "checkout", cve_sha]
         rc = subprocess.call(cmd, stdout=subprocess.DEVNULL)
+        # remove the CVE id suffix starting with an underscore
+        # we do this so we can identify multiple git patches belonging to the
+        # same CVE and set the topic accordingly
+        actual_cve_id = cve_id
+        suffix_start = cve_id.rfind('_')
+        if suffix_start > 0:
+            actual_cve_id = cve_id[0:suffix_start]
         # perform the actual push
         rc = push_to_gerrit(kernel_repo, gerrit_remote, gerrit_user, branch,
-                            cve_id)
+                            actual_cve_id)
         if rc != 0:
             print("[E] Failed to push " + cve_id + " to Gerrit")