wuyuoss / rpms / rpm

Forked from rpms/rpm 3 years ago
Clone
648606
From 89e6317c75b494905590903fadbfdc3c8d31e2b8 Mon Sep 17 00:00:00 2001
648606
From: Stefan Berger <stefanb@us.ibm.com>
648606
Date: Fri, 29 Apr 2016 07:09:49 -0400
648606
Subject: [PATCH] Extend header size to 256MB due to file signatures
648606
648606
Extend the header size to 256MB in case an RPM has a lot of files
648606
and the file signatures do not fit within the current limit of 16MB.
648606
648606
An example for an RPM with many files is kcbench-data-4.0. It contains
648606
more than 52000 files. With each signature with a 2048 bit key requiring
648606
256 bytes plus a preamble, its representation in text from, and other
648606
overhead, the size of the header (index length and data length) exceeds
648606
32Mb.
648606
648606
If this particular RPM's files have been signed using this patch, older
648606
versions of the rpm tool will report the header being too large. So this
648606
failure is expected then.
648606
648606
By setting the limit to 256MB we create a lot of room for the future.
648606
648606
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
648606
---
648606
 lib/header.c          | 2 +-
648606
 lib/header_internal.h | 5 +++--
648606
 2 files changed, 4 insertions(+), 3 deletions(-)
648606
648606
diff --git a/lib/header.c b/lib/header.c
648606
index 81f2038..7f7c115 100644
648606
--- a/lib/header.c
648606
+++ b/lib/header.c
648606
@@ -99,7 +99,7 @@ struct headerToken_s {
648606
 /** \ingroup header
648606
  * Maximum no. of bytes permitted in a header.
648606
  */
648606
-static const size_t headerMaxbytes = (32*1024*1024);
648606
+static const size_t headerMaxbytes = (256*1024*1024);
648606
 
648606
 #define	INDEX_MALLOC_SIZE	8
648606
 
648606
diff --git a/lib/header_internal.h b/lib/header_internal.h
648606
index bbe2097..aed3977 100644
648606
--- a/lib/header_internal.h
648606
+++ b/lib/header_internal.h
648606
@@ -45,9 +45,10 @@ struct indexEntry_s {
648606
 
648606
 /**
648606
  * Sanity check on data size and/or offset and/or count.
648606
- * This check imposes a limit of 16 MB, more than enough.
648606
+ * This check imposes a limit of 256 MB -- file signatures
648606
+ * may require a lot of space in the header.
648606
  */
648606
-#define HEADER_DATA_MAX 0x00ffffff
648606
+#define HEADER_DATA_MAX 0x0fffffff
648606
 #define hdrchkData(_nbytes) ((_nbytes) & (~HEADER_DATA_MAX))
648606
 
648606
 /**
648606
-- 
648606
2.9.5
648606