Skip to contentSkip to conversation

doc: relax requirement on commit messages of security fixes

PATCH Applied [email protected] 5 participants 5 messages Mar 10, 2022 – Nov 24, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 doc: relax requirement on commit messages of security fixes

From: Luca Boccassi <[email protected]>

Allow more flexibility with embargo lifting by not requiring mentions of CVEs in commit messages if the lift date allows it.

---
 doc/guides/contributing/vulnerability.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
doc/guides/contributing/vulnerability.rst +4 -1
index b6300252ad..fc60e02e37 100644
@@ -170,7 +170,10 @@ The patches fixing the vulnerability are developed and reviewed
 by the security team and
 by elected area experts that agree to maintain confidentiality.
 
-The CVE id and the bug id must be referenced in the patch.
+The CVE id and the bug id must be referenced in the patch if there is no
+embargo, or if there is an embargo, but it will be lifted when the release
+including the patch is published. If the embargo is going to be lifted after the
+release, then the CVE and bug ids must be omitted from the commit message.
 
 Backports to the identified affected versions are done once the fix is ready.
 
Signature · 1 line
2.34.1
#1 lore raw

We missed this patch, there was no comment.
Please review.

10/03/2022 18:59, [email protected]:

Quoted 13 lines

From: Luca Boccassi <[email protected]>

Allow more flexibility with embargo lifting by not requiring mentions of CVEs in commit messages if the lift date allows it.

---

doc/guides/contributing/vulnerability.rst +4 -1
-The CVE id and the bug id must be referenced in the patch.
+The CVE id and the bug id must be referenced in the patch if there is no
+embargo, or if there is an embargo, but it will be lifted when the release
+including the patch is published. If the embargo is going to be lifted after the
+release, then the CVE and bug ids must be omitted from the commit message.
Reviewed-by
#2 lore raw

Indeed!

Quoted 10 lines · Thomas Monjalon

We missed this patch, there was no comment.
Please review.

10/03/2022 18:59, [email protected]:

Quoted 6 lines

From: Luca Boccassi <[email protected]>

Allow more flexibility with embargo lifting by not requiring mentions of CVEs in commit messages if the lift date allows it.

Quoted 9 lines

doc/guides/contributing/vulnerability.rst The patches fixing the vulnerability are developed and reviewed · line 176

Quoted 7 lines

---

doc/guides/contributing/vulnerability.rst +4 -1
-The CVE id and the bug id must be referenced in the patch.
+The CVE id and the bug id must be referenced in the patch if there is no
+embargo, or if there is an embargo, but it will be lifted when the release
+including the patch is published. If the embargo is going to be lifted after the
+release, then the CVE and bug ids must be omitted from the commit message.

Thanks,
Maxime

#3 lore raw
Quoted 23 lines · On Fri, 31 Mar 2023 12:37:40 +0200 Maxime Coquelin…

Indeed!

Quoted 10 lines · Thomas Monjalon

We missed this patch, there was no comment.
Please review.

10/03/2022 18:59, [email protected]:

Quoted 6 lines

From: Luca Boccassi <[email protected]>

Allow more flexibility with embargo lifting by not requiring mentions of CVEs in commit messages if the lift date allows it.

Quoted 9 lines

doc/guides/contributing/vulnerability.rst The patches fixing the vulnerability are developed and reviewed · line 176

Quoted 7 lines

---

doc/guides/contributing/vulnerability.rst +4 -1
-The CVE id and the bug id must be referenced in the patch.
+The CVE id and the bug id must be referenced in the patch if there is no
+embargo, or if there is an embargo, but it will be lifted when the release
+including the patch is published. If the embargo is going to be lifted after the
+release, then the CVE and bug ids must be omitted from the commit message.  
Quoted 1 line