[Pkg-ceph-commits] [ceph] 05/12: Add bug-11860.patch to fix quotes in bucket header for rgw

[Gaudenz Steinlin]

This is an automated email from the git hooks/post-receive script.

gaudenz pushed a commit to branch master
in repository ceph.

commit 6fc46bc6ce179d9009972f399239bd6f3d9c911d
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date:   Wed Sep 23 15:53:05 2015 +0200

    Add bug-11860.patch to fix quotes in bucket header for rgw
    
    This patch is a prerequisite to the CVE-2015-5245 fix.
---
 debian/patches/bug-11860.patch | 24 ++++++++++++++++++++++++
 debian/patches/series          |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/bug-11860.patch b/debian/patches/bug-11860.patch
new file mode 100644
index 0000000..2be008c
--- /dev/null
+++ b/debian/patches/bug-11860.patch
@@ -0,0 +1,24 @@
+From 8af25faed93fe02d3dad585b8579ce8b041cc4e6 Mon Sep 17 00:00:00 2001
+From: Wido den Hollander <wido at 42on.com>
+Date: Wed, 3 Jun 2015 13:13:33 +0200
+Subject: [PATCH] rgw: Do not enclose the Bucket header in quotes
+
+Fixes: #11860
+Signed-off-by: Wido den Hollander <wido at 42on.com>
+---
+ src/rgw/rgw_rest.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
+index 228eea9..fffc003 100644
+--- a/src/rgw/rgw_rest.cc
++++ b/src/rgw/rgw_rest.cc
+@@ -362,7 +362,7 @@ void dump_bucket_from_state(struct req_state *s)
+   int expose_bucket = g_conf->rgw_expose_bucket;
+   if (expose_bucket) {
+     if (!s->bucket_name_str.empty())
+-      s->cio->print("Bucket: \"%s\"\r\n", s->bucket_name_str.c_str());
++      s->cio->print("Bucket: %s\r\n", s->bucket_name_str.c_str());
+   }
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d7ca3d4..237be42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,6 +12,7 @@ backfill-prio.patch
 bash-completion.patch
 rbdmap1-mount.patch
 rbdmap2-hooks.patch
+bug-11860.patch
 boost-1.58.patch
 
 ## Debian

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git