Skip to content

Commit 3fd0b1e

Browse files
[Medium] Patch ceph to fix CVE-2012-6708
1 parent a72e08e commit 3fd0b1e

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

SPECS/ceph/CVE-2012-6708.patch

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From c993d7d4b9ddb5d9dcb0c4120f798730aacfff0a Mon Sep 17 00:00:00 2001
2+
From: Kevin Lockwood <[email protected]>
3+
Date: Mon, 13 Jan 2025 14:53:54 -0800
4+
Subject: [PATCH] Adjust jQuery('html') detection to only match when html
5+
starts with '<' (not counting space characters). Fixes #11290.
6+
7+
Source: https://github.com/jquery/jquery/commit/05531fc4080ae24070930d15ae0cea7ae056457d.patch
8+
---
9+
qa/workunits/erasure-code/jquery.js | 3 ++-
10+
1 file changed, 2 insertions(+), 1 deletion(-)
11+
12+
diff --git a/qa/workunits/erasure-code/jquery.js b/qa/workunits/erasure-code/jquery.js
13+
index 8c24ffc61..45c208837 100644
14+
--- a/qa/workunits/erasure-code/jquery.js
15+
+++ b/qa/workunits/erasure-code/jquery.js
16+
@@ -56,7 +56,8 @@ var
17+
18+
// A simple way to check for HTML strings
19+
// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
20+
- rquickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
21+
+ // Strict HTML recognition (#11290: must start with <)
22+
+ rquickExpr = /^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,
23+
24+
// Match a standalone tag
25+
rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
26+
--
27+
2.34.1
28+

SPECS/ceph/ceph.spec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Patch2: CVE-2024-52338.patch
1717
Patch3: CVE-2014-5461.patch
1818
Patch4: CVE-2020-22217.patch
1919
Patch5: CVE-2015-9251.patch
20+
Patch6: CVE-2012-6708.patch
2021
#
2122
# Copyright (C) 2004-2019 The Ceph Project Developers. See COPYING file
2223
# at the top-level directory of this distribution and at
@@ -2011,6 +2012,7 @@ exit 0
20112012
- Fix for CVE-2014-5461
20122013
- Fix for CVE-2020-22217
20132014
- Fix for CVE-2015-9251
2015+
- Fix for CVE-2012-6708
20142016

20152017
* Tue Jan 01 2025 Sandeep Karambelkar <[email protected]> - 18.2.2-3
20162018
- Based on the package build logs, opentelemetry-cpp submodule is not being built

0 commit comments

Comments
 (0)