* [meta][dunfell][PATCH] rpm: Handle proper return value to avoid major issues and removing unnecessary code
@ 2021-09-08 14:02 Ranjitsinh Rathod
2021-09-13 15:54 ` Ranjitsinh Rathod
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Ranjitsinh Rathod @ 2021-09-08 14:02 UTC (permalink / raw)
To: openembedded-core; +Cc: Ranjitsinh Rathod
From: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
Change in 2 patch as below to avoid critical issues
1) 0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
Handled return values of getrlimit() and lzma_cputhreads() functions
to avoid unexpected behaviours like devide by zero and potential read
of uninitialized variable 'virtual_memory'
Upstream-Status: Pending [merge of multithreading patches to upstream]
2) CVE-2021-3421.patch
Removed RPMSIGTAG_FILESIGNATURES and RPMSIGTAG_FILESIGNATURELENGTH as
it is not needed during backporting of original patch.
Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/d6a86b5e69e46cc283b1e06c92343319beb42e21]
Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
---
...rict-virtual-memory-usage-if-limit-s.patch | 25 ++++++++-------
.../rpm/files/CVE-2021-3421.patch | 32 +++----------------
2 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch b/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
index 6454785254..dc3f74fecd 100644
--- a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
+++ b/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
@@ -11,36 +11,39 @@ CPU thread.
Upstream-Status: Pending [merge of multithreading patches to upstream]
Signed-off-by: Peter Bergin <peter@berginkonsult.se>
+Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
---
- rpmio/rpmio.c | 34 ++++++++++++++++++++++++++++++++++
- 1 file changed, 34 insertions(+)
+ rpmio/rpmio.c | 36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index e051c98..b3c56b6 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
-@@ -845,6 +845,40 @@ static LZFILE *lzopen_internal(const char *mode, int fd, int xz)
+@@ -845,6 +845,42 @@ static LZFILE *lzopen_internal(const char *mode, int fd, int xz)
}
#endif
-+ struct rlimit virtual_memory;
-+ getrlimit(RLIMIT_AS, &virtual_memory);
-+ if (virtual_memory.rlim_cur != RLIM_INFINITY) {
++ struct rlimit virtual_memory = {RLIM_INFINITY , RLIM_INFINITY};
++ int status = getrlimit(RLIMIT_AS, &virtual_memory);
++ if ((status != -1) && (virtual_memory.rlim_cur != RLIM_INFINITY)) {
+ const uint64_t virtual_memlimit = virtual_memory.rlim_cur;
++ uint32_t threads_max = lzma_cputhreads();
+ const uint64_t virtual_memlimit_per_cpu_thread =
-+ virtual_memlimit / lzma_cputhreads();
-+ uint64_t memory_usage_virt;
++ virtual_memlimit / ((threads_max == 0) ? 1 : threads_max);
+ rpmlog(RPMLOG_NOTICE, "XZ: virtual memory restricted to %lu and "
+ "per CPU thread %lu\n", virtual_memlimit, virtual_memlimit_per_cpu_thread);
++ uint64_t memory_usage_virt;
+ /* keep reducing the number of compression threads until memory
+ usage falls below the limit per CPU thread*/
+ while ((memory_usage_virt = lzma_stream_encoder_mt_memusage(&mt_options)) >
+ virtual_memlimit_per_cpu_thread) {
-+ /* If number of threads goes down to zero lzma_stream_encoder will
-+ * will return UINT64_MAX. We must check here to avoid an infinite loop.
++ /* If number of threads goes down to zero or in case of any other error
++ * lzma_stream_encoder_mt_memusage will return UINT64_MAX. We must check
++ * for both the cases here to avoid an infinite loop.
+ * If we get into situation that one thread requires more virtual memory
+ * than available we set one thread, print error message and try anyway. */
-+ if (--mt_options.threads == 0) {
++ if ((--mt_options.threads == 0) || (memory_usage_virt == UINT64_MAX)) {
+ mt_options.threads = 1;
+ rpmlog(RPMLOG_WARNING,
+ "XZ: Could not adjust number of threads to get below "
diff --git a/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch b/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
index b1a05b6863..d2ad5eabac 100644
--- a/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
+++ b/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
@@ -22,16 +22,16 @@ Fixes: CVE-2021-3421, CVE-2021-20271
Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/d6a86b5e69e46cc283b1e06c92343319beb42e21]
CVE: CVE-2021-3421
Signed-off-by: Minjae Kim <flowergom@gmail.com>
+Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
---
- lib/package.c | 115 ++++++++++++++++++++++++--------------------------
- lib/rpmtag.h | 4 ++
- 2 files changed, 58 insertions(+), 61 deletions(-)
+ lib/package.c | 113 ++++++++++++++++++++++++--------------------------
+ 1 file changed, 52 insertions(+), 61 deletions(-)
diff --git a/lib/package.c b/lib/package.c
index 081123d84e..7c26ea323f 100644
--- a/lib/package.c
+++ b/lib/package.c
-@@ -20,76 +20,68 @@
+@@ -20,76 +20,67 @@
#include "debug.h"
@@ -46,8 +46,6 @@ index 081123d84e..7c26ea323f 100644
+ { RPMSIGTAG_GPG, RPMTAG_SIGGPG, 0 },
+ /* { RPMSIGTAG_PGP5, RPMTAG_SIGPGP5, 0 }, */ /* long obsolete, dont use */
+ { RPMSIGTAG_PAYLOADSIZE, RPMTAG_ARCHIVESIZE, 1 },
-+ { RPMSIGTAG_FILESIGNATURES, RPMTAG_FILESIGNATURES, 0 },
-+ { RPMSIGTAG_FILESIGNATURELENGTH, RPMTAG_FILESIGNATURELENGTH, 1 },
+ { RPMSIGTAG_SHA1, RPMTAG_SHA1HEADER, 1 },
+ { RPMSIGTAG_SHA256, RPMTAG_SHA256HEADER, 1 },
+ { RPMSIGTAG_DSA, RPMTAG_DSAHEADER, 0 },
@@ -61,6 +59,7 @@ index 081123d84e..7c26ea323f 100644
* Translate and merge legacy signature tags into header.
* @param h header (dest)
* @param sigh signature header (src)
++ * @return failing tag number, 0 on success
*/
static
-void headerMergeLegacySigs(Header h, Header sigh)
@@ -170,27 +169,6 @@ index 081123d84e..7c26ea323f 100644
applyRetrofits(h);
/* Bump reference count for return. */
-diff --git a/lib/rpmtag.h b/lib/rpmtag.h
-index 8c718b31b5..d562572c6f 100644
---- a/lib/rpmtag.h
-+++ b/lib/rpmtag.h
-@@ -65,6 +65,8 @@ typedef enum rpmTag_e {
- RPMTAG_LONGARCHIVESIZE = RPMTAG_SIG_BASE+15, /* l */
- /* RPMTAG_SIG_BASE+16 reserved */
- RPMTAG_SHA256HEADER = RPMTAG_SIG_BASE+17, /* s */
-+ /* RPMTAG_SIG_BASE+18 reserved for RPMSIGTAG_FILESIGNATURES */
-+ /* RPMTAG_SIG_BASE+19 reserved for RPMSIGTAG_FILESIGNATURELENGTH */
-
- RPMTAG_NAME = 1000, /* s */
- #define RPMTAG_N RPMTAG_NAME /* s */
-@@ -422,6 +424,8 @@ typedef enum rpmSigTag_e {
- RPMSIGTAG_LONGSIZE = RPMTAG_LONGSIGSIZE, /*!< internal Header+Payload size (64bit) in bytes. */
- RPMSIGTAG_LONGARCHIVESIZE = RPMTAG_LONGARCHIVESIZE, /*!< internal uncompressed payload size (64bit) in bytes. */
- RPMSIGTAG_SHA256 = RPMTAG_SHA256HEADER,
-+ RPMSIGTAG_FILESIGNATURES = RPMTAG_SIG_BASE + 18,
-+ RPMSIGTAG_FILESIGNATURELENGTH = RPMTAG_SIG_BASE + 19,
- } rpmSigTag;
-
--
2.17.1
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [meta][dunfell][PATCH] rpm: Handle proper return value to avoid major issues and removing unnecessary code
2021-09-08 14:02 [meta][dunfell][PATCH] rpm: Handle proper return value to avoid major issues and removing unnecessary code Ranjitsinh Rathod
@ 2021-09-13 15:54 ` Ranjitsinh Rathod
2021-09-13 18:34 ` [OE-core] " Steve Sakoman
2021-09-15 14:59 ` [OE-core] " Steve Sakoman
2 siblings, 0 replies; 8+ messages in thread
From: Ranjitsinh Rathod @ 2021-09-13 15:54 UTC (permalink / raw)
To: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 70 bytes --]
Can someone please check this and confirm if this can go on dunfell?
[-- Attachment #2: Type: text/html, Size: 70 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [meta][dunfell][PATCH] rpm: Handle proper return value to avoid major issues and removing unnecessary code
2021-09-08 14:02 [meta][dunfell][PATCH] rpm: Handle proper return value to avoid major issues and removing unnecessary code Ranjitsinh Rathod
2021-09-13 15:54 ` Ranjitsinh Rathod
@ 2021-09-13 18:34 ` Steve Sakoman
2021-09-14 0:15 ` Minjae Kim
2021-09-15 14:59 ` [OE-core] " Steve Sakoman
2 siblings, 1 reply; 8+ messages in thread
From: Steve Sakoman @ 2021-09-13 18:34 UTC (permalink / raw)
To: Ranjitsinh Rathod, Minjae Kim
Cc: Patches and discussions about the oe-core layer, Ranjitsinh Rathod
On Wed, Sep 8, 2021 at 4:02 AM Ranjitsinh Rathod
<ranjitsinhrathod1991@gmail.com> wrote:
>
> From: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
>
> Change in 2 patch as below to avoid critical issues
> 1) 0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> Handled return values of getrlimit() and lzma_cputhreads() functions
> to avoid unexpected behaviours like devide by zero and potential read
> of uninitialized variable 'virtual_memory'
> Upstream-Status: Pending [merge of multithreading patches to upstream]
>
> 2) CVE-2021-3421.patch
> Removed RPMSIGTAG_FILESIGNATURES and RPMSIGTAG_FILESIGNATURELENGTH as
> it is not needed during backporting of original patch.
> Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/d6a86b5e69e46cc283b1e06c92343319beb42e21]
Minjae, can you review this since he is modifying your CVE patch?
Thanks!
Steve
> Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> ---
> ...rict-virtual-memory-usage-if-limit-s.patch | 25 ++++++++-------
> .../rpm/files/CVE-2021-3421.patch | 32 +++----------------
> 2 files changed, 19 insertions(+), 38 deletions(-)
>
> diff --git a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch b/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> index 6454785254..dc3f74fecd 100644
> --- a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> +++ b/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> @@ -11,36 +11,39 @@ CPU thread.
> Upstream-Status: Pending [merge of multithreading patches to upstream]
>
> Signed-off-by: Peter Bergin <peter@berginkonsult.se>
> +Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> ---
> - rpmio/rpmio.c | 34 ++++++++++++++++++++++++++++++++++
> - 1 file changed, 34 insertions(+)
> + rpmio/rpmio.c | 36 ++++++++++++++++++++++++++++++++++++
> + 1 file changed, 36 insertions(+)
>
> diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
> index e051c98..b3c56b6 100644
> --- a/rpmio/rpmio.c
> +++ b/rpmio/rpmio.c
> -@@ -845,6 +845,40 @@ static LZFILE *lzopen_internal(const char *mode, int fd, int xz)
> +@@ -845,6 +845,42 @@ static LZFILE *lzopen_internal(const char *mode, int fd, int xz)
> }
> #endif
>
> -+ struct rlimit virtual_memory;
> -+ getrlimit(RLIMIT_AS, &virtual_memory);
> -+ if (virtual_memory.rlim_cur != RLIM_INFINITY) {
> ++ struct rlimit virtual_memory = {RLIM_INFINITY , RLIM_INFINITY};
> ++ int status = getrlimit(RLIMIT_AS, &virtual_memory);
> ++ if ((status != -1) && (virtual_memory.rlim_cur != RLIM_INFINITY)) {
> + const uint64_t virtual_memlimit = virtual_memory.rlim_cur;
> ++ uint32_t threads_max = lzma_cputhreads();
> + const uint64_t virtual_memlimit_per_cpu_thread =
> -+ virtual_memlimit / lzma_cputhreads();
> -+ uint64_t memory_usage_virt;
> ++ virtual_memlimit / ((threads_max == 0) ? 1 : threads_max);
> + rpmlog(RPMLOG_NOTICE, "XZ: virtual memory restricted to %lu and "
> + "per CPU thread %lu\n", virtual_memlimit, virtual_memlimit_per_cpu_thread);
> ++ uint64_t memory_usage_virt;
> + /* keep reducing the number of compression threads until memory
> + usage falls below the limit per CPU thread*/
> + while ((memory_usage_virt = lzma_stream_encoder_mt_memusage(&mt_options)) >
> + virtual_memlimit_per_cpu_thread) {
> -+ /* If number of threads goes down to zero lzma_stream_encoder will
> -+ * will return UINT64_MAX. We must check here to avoid an infinite loop.
> ++ /* If number of threads goes down to zero or in case of any other error
> ++ * lzma_stream_encoder_mt_memusage will return UINT64_MAX. We must check
> ++ * for both the cases here to avoid an infinite loop.
> + * If we get into situation that one thread requires more virtual memory
> + * than available we set one thread, print error message and try anyway. */
> -+ if (--mt_options.threads == 0) {
> ++ if ((--mt_options.threads == 0) || (memory_usage_virt == UINT64_MAX)) {
> + mt_options.threads = 1;
> + rpmlog(RPMLOG_WARNING,
> + "XZ: Could not adjust number of threads to get below "
> diff --git a/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch b/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> index b1a05b6863..d2ad5eabac 100644
> --- a/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> +++ b/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> @@ -22,16 +22,16 @@ Fixes: CVE-2021-3421, CVE-2021-20271
> Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/d6a86b5e69e46cc283b1e06c92343319beb42e21]
> CVE: CVE-2021-3421
> Signed-off-by: Minjae Kim <flowergom@gmail.com>
> +Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> ---
> - lib/package.c | 115 ++++++++++++++++++++++++--------------------------
> - lib/rpmtag.h | 4 ++
> - 2 files changed, 58 insertions(+), 61 deletions(-)
> + lib/package.c | 113 ++++++++++++++++++++++++--------------------------
> + 1 file changed, 52 insertions(+), 61 deletions(-)
>
> diff --git a/lib/package.c b/lib/package.c
> index 081123d84e..7c26ea323f 100644
> --- a/lib/package.c
> +++ b/lib/package.c
> -@@ -20,76 +20,68 @@
> +@@ -20,76 +20,67 @@
>
> #include "debug.h"
>
> @@ -46,8 +46,6 @@ index 081123d84e..7c26ea323f 100644
> + { RPMSIGTAG_GPG, RPMTAG_SIGGPG, 0 },
> + /* { RPMSIGTAG_PGP5, RPMTAG_SIGPGP5, 0 }, */ /* long obsolete, dont use */
> + { RPMSIGTAG_PAYLOADSIZE, RPMTAG_ARCHIVESIZE, 1 },
> -+ { RPMSIGTAG_FILESIGNATURES, RPMTAG_FILESIGNATURES, 0 },
> -+ { RPMSIGTAG_FILESIGNATURELENGTH, RPMTAG_FILESIGNATURELENGTH, 1 },
> + { RPMSIGTAG_SHA1, RPMTAG_SHA1HEADER, 1 },
> + { RPMSIGTAG_SHA256, RPMTAG_SHA256HEADER, 1 },
> + { RPMSIGTAG_DSA, RPMTAG_DSAHEADER, 0 },
> @@ -61,6 +59,7 @@ index 081123d84e..7c26ea323f 100644
> * Translate and merge legacy signature tags into header.
> * @param h header (dest)
> * @param sigh signature header (src)
> ++ * @return failing tag number, 0 on success
> */
> static
> -void headerMergeLegacySigs(Header h, Header sigh)
> @@ -170,27 +169,6 @@ index 081123d84e..7c26ea323f 100644
> applyRetrofits(h);
>
> /* Bump reference count for return. */
> -diff --git a/lib/rpmtag.h b/lib/rpmtag.h
> -index 8c718b31b5..d562572c6f 100644
> ---- a/lib/rpmtag.h
> -+++ b/lib/rpmtag.h
> -@@ -65,6 +65,8 @@ typedef enum rpmTag_e {
> - RPMTAG_LONGARCHIVESIZE = RPMTAG_SIG_BASE+15, /* l */
> - /* RPMTAG_SIG_BASE+16 reserved */
> - RPMTAG_SHA256HEADER = RPMTAG_SIG_BASE+17, /* s */
> -+ /* RPMTAG_SIG_BASE+18 reserved for RPMSIGTAG_FILESIGNATURES */
> -+ /* RPMTAG_SIG_BASE+19 reserved for RPMSIGTAG_FILESIGNATURELENGTH */
> -
> - RPMTAG_NAME = 1000, /* s */
> - #define RPMTAG_N RPMTAG_NAME /* s */
> -@@ -422,6 +424,8 @@ typedef enum rpmSigTag_e {
> - RPMSIGTAG_LONGSIZE = RPMTAG_LONGSIGSIZE, /*!< internal Header+Payload size (64bit) in bytes. */
> - RPMSIGTAG_LONGARCHIVESIZE = RPMTAG_LONGARCHIVESIZE, /*!< internal uncompressed payload size (64bit) in bytes. */
> - RPMSIGTAG_SHA256 = RPMTAG_SHA256HEADER,
> -+ RPMSIGTAG_FILESIGNATURES = RPMTAG_SIG_BASE + 18,
> -+ RPMSIGTAG_FILESIGNATURELENGTH = RPMTAG_SIG_BASE + 19,
> - } rpmSigTag;
> -
>
> --
> 2.17.1
> --
> 2.17.1
>
>
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta][dunfell][PATCH] rpm: Handle proper return value to avoid major issues and removing unnecessary code
2021-09-13 18:34 ` [OE-core] " Steve Sakoman
@ 2021-09-14 0:15 ` Minjae Kim
0 siblings, 0 replies; 8+ messages in thread
From: Minjae Kim @ 2021-09-14 0:15 UTC (permalink / raw)
To: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
On Mon, Sep 13, 2021 at 11:34 AM, Steve Sakoman wrote:
>
> RPMSIGTAG_FILESIGNATURELENGTH
Hi, Steve and Ranjitsinh,
Sorry for the late response.
I know that the RPMSIGTAG_FILESIGNATURES and RPMSIGTAG_FILESIGNATURELENGTH are defined in the original commit, but are not used.
I left it with the author`s intent. If the build goes well without those variables, it doesn't seem to matter.
Thanks,
Minjae Kim.
[-- Attachment #2: Type: text/html, Size: 527 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [meta][dunfell][PATCH] rpm: Handle proper return value to avoid major issues and removing unnecessary code
2021-09-08 14:02 [meta][dunfell][PATCH] rpm: Handle proper return value to avoid major issues and removing unnecessary code Ranjitsinh Rathod
2021-09-13 15:54 ` Ranjitsinh Rathod
2021-09-13 18:34 ` [OE-core] " Steve Sakoman
@ 2021-09-15 14:59 ` Steve Sakoman
2021-09-15 15:06 ` Alexander Kanavin
2 siblings, 1 reply; 8+ messages in thread
From: Steve Sakoman @ 2021-09-15 14:59 UTC (permalink / raw)
To: Ranjitsinh Rathod
Cc: Patches and discussions about the oe-core layer, Ranjitsinh Rathod
On Wed, Sep 8, 2021 at 4:02 AM Ranjitsinh Rathod
<ranjitsinhrathod1991@gmail.com> wrote:
>
> From: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
>
> Change in 2 patch as below to avoid critical issues
> 1) 0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> Handled return values of getrlimit() and lzma_cputhreads() functions
> to avoid unexpected behaviours like devide by zero and potential read
> of uninitialized variable 'virtual_memory'
> Upstream-Status: Pending [merge of multithreading patches to upstream]
This does look like a good fix. Are these changes to the patch from upstream?
Once upstream has accepted the change we should change the status from
"pending", but for now this is ok.
> 2) CVE-2021-3421.patch
> Removed RPMSIGTAG_FILESIGNATURES and RPMSIGTAG_FILESIGNATURELENGTH as
> it is not needed during backporting of original patch.
> Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/d6a86b5e69e46cc283b1e06c92343319beb42e21]
Removing these unused definitions doesn't really seem like a critical
issue. I'd prefer to leave the CVE patch in its original form.
Could you submit a V2 with this change?
Thanks!
Steve
> Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> ---
> ...rict-virtual-memory-usage-if-limit-s.patch | 25 ++++++++-------
> .../rpm/files/CVE-2021-3421.patch | 32 +++----------------
> 2 files changed, 19 insertions(+), 38 deletions(-)
>
> diff --git a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch b/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> index 6454785254..dc3f74fecd 100644
> --- a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> +++ b/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> @@ -11,36 +11,39 @@ CPU thread.
> Upstream-Status: Pending [merge of multithreading patches to upstream]
>
> Signed-off-by: Peter Bergin <peter@berginkonsult.se>
> +Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> ---
> - rpmio/rpmio.c | 34 ++++++++++++++++++++++++++++++++++
> - 1 file changed, 34 insertions(+)
> + rpmio/rpmio.c | 36 ++++++++++++++++++++++++++++++++++++
> + 1 file changed, 36 insertions(+)
>
> diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
> index e051c98..b3c56b6 100644
> --- a/rpmio/rpmio.c
> +++ b/rpmio/rpmio.c
> -@@ -845,6 +845,40 @@ static LZFILE *lzopen_internal(const char *mode, int fd, int xz)
> +@@ -845,6 +845,42 @@ static LZFILE *lzopen_internal(const char *mode, int fd, int xz)
> }
> #endif
>
> -+ struct rlimit virtual_memory;
> -+ getrlimit(RLIMIT_AS, &virtual_memory);
> -+ if (virtual_memory.rlim_cur != RLIM_INFINITY) {
> ++ struct rlimit virtual_memory = {RLIM_INFINITY , RLIM_INFINITY};
> ++ int status = getrlimit(RLIMIT_AS, &virtual_memory);
> ++ if ((status != -1) && (virtual_memory.rlim_cur != RLIM_INFINITY)) {
> + const uint64_t virtual_memlimit = virtual_memory.rlim_cur;
> ++ uint32_t threads_max = lzma_cputhreads();
> + const uint64_t virtual_memlimit_per_cpu_thread =
> -+ virtual_memlimit / lzma_cputhreads();
> -+ uint64_t memory_usage_virt;
> ++ virtual_memlimit / ((threads_max == 0) ? 1 : threads_max);
> + rpmlog(RPMLOG_NOTICE, "XZ: virtual memory restricted to %lu and "
> + "per CPU thread %lu\n", virtual_memlimit, virtual_memlimit_per_cpu_thread);
> ++ uint64_t memory_usage_virt;
> + /* keep reducing the number of compression threads until memory
> + usage falls below the limit per CPU thread*/
> + while ((memory_usage_virt = lzma_stream_encoder_mt_memusage(&mt_options)) >
> + virtual_memlimit_per_cpu_thread) {
> -+ /* If number of threads goes down to zero lzma_stream_encoder will
> -+ * will return UINT64_MAX. We must check here to avoid an infinite loop.
> ++ /* If number of threads goes down to zero or in case of any other error
> ++ * lzma_stream_encoder_mt_memusage will return UINT64_MAX. We must check
> ++ * for both the cases here to avoid an infinite loop.
> + * If we get into situation that one thread requires more virtual memory
> + * than available we set one thread, print error message and try anyway. */
> -+ if (--mt_options.threads == 0) {
> ++ if ((--mt_options.threads == 0) || (memory_usage_virt == UINT64_MAX)) {
> + mt_options.threads = 1;
> + rpmlog(RPMLOG_WARNING,
> + "XZ: Could not adjust number of threads to get below "
> diff --git a/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch b/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> index b1a05b6863..d2ad5eabac 100644
> --- a/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> +++ b/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> @@ -22,16 +22,16 @@ Fixes: CVE-2021-3421, CVE-2021-20271
> Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/d6a86b5e69e46cc283b1e06c92343319beb42e21]
> CVE: CVE-2021-3421
> Signed-off-by: Minjae Kim <flowergom@gmail.com>
> +Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> ---
> - lib/package.c | 115 ++++++++++++++++++++++++--------------------------
> - lib/rpmtag.h | 4 ++
> - 2 files changed, 58 insertions(+), 61 deletions(-)
> + lib/package.c | 113 ++++++++++++++++++++++++--------------------------
> + 1 file changed, 52 insertions(+), 61 deletions(-)
>
> diff --git a/lib/package.c b/lib/package.c
> index 081123d84e..7c26ea323f 100644
> --- a/lib/package.c
> +++ b/lib/package.c
> -@@ -20,76 +20,68 @@
> +@@ -20,76 +20,67 @@
>
> #include "debug.h"
>
> @@ -46,8 +46,6 @@ index 081123d84e..7c26ea323f 100644
> + { RPMSIGTAG_GPG, RPMTAG_SIGGPG, 0 },
> + /* { RPMSIGTAG_PGP5, RPMTAG_SIGPGP5, 0 }, */ /* long obsolete, dont use */
> + { RPMSIGTAG_PAYLOADSIZE, RPMTAG_ARCHIVESIZE, 1 },
> -+ { RPMSIGTAG_FILESIGNATURES, RPMTAG_FILESIGNATURES, 0 },
> -+ { RPMSIGTAG_FILESIGNATURELENGTH, RPMTAG_FILESIGNATURELENGTH, 1 },
> + { RPMSIGTAG_SHA1, RPMTAG_SHA1HEADER, 1 },
> + { RPMSIGTAG_SHA256, RPMTAG_SHA256HEADER, 1 },
> + { RPMSIGTAG_DSA, RPMTAG_DSAHEADER, 0 },
> @@ -61,6 +59,7 @@ index 081123d84e..7c26ea323f 100644
> * Translate and merge legacy signature tags into header.
> * @param h header (dest)
> * @param sigh signature header (src)
> ++ * @return failing tag number, 0 on success
> */
> static
> -void headerMergeLegacySigs(Header h, Header sigh)
> @@ -170,27 +169,6 @@ index 081123d84e..7c26ea323f 100644
> applyRetrofits(h);
>
> /* Bump reference count for return. */
> -diff --git a/lib/rpmtag.h b/lib/rpmtag.h
> -index 8c718b31b5..d562572c6f 100644
> ---- a/lib/rpmtag.h
> -+++ b/lib/rpmtag.h
> -@@ -65,6 +65,8 @@ typedef enum rpmTag_e {
> - RPMTAG_LONGARCHIVESIZE = RPMTAG_SIG_BASE+15, /* l */
> - /* RPMTAG_SIG_BASE+16 reserved */
> - RPMTAG_SHA256HEADER = RPMTAG_SIG_BASE+17, /* s */
> -+ /* RPMTAG_SIG_BASE+18 reserved for RPMSIGTAG_FILESIGNATURES */
> -+ /* RPMTAG_SIG_BASE+19 reserved for RPMSIGTAG_FILESIGNATURELENGTH */
> -
> - RPMTAG_NAME = 1000, /* s */
> - #define RPMTAG_N RPMTAG_NAME /* s */
> -@@ -422,6 +424,8 @@ typedef enum rpmSigTag_e {
> - RPMSIGTAG_LONGSIZE = RPMTAG_LONGSIGSIZE, /*!< internal Header+Payload size (64bit) in bytes. */
> - RPMSIGTAG_LONGARCHIVESIZE = RPMTAG_LONGARCHIVESIZE, /*!< internal uncompressed payload size (64bit) in bytes. */
> - RPMSIGTAG_SHA256 = RPMTAG_SHA256HEADER,
> -+ RPMSIGTAG_FILESIGNATURES = RPMTAG_SIG_BASE + 18,
> -+ RPMSIGTAG_FILESIGNATURELENGTH = RPMTAG_SIG_BASE + 19,
> - } rpmSigTag;
> -
>
> --
> 2.17.1
> --
> 2.17.1
>
>
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [meta][dunfell][PATCH] rpm: Handle proper return value to avoid major issues and removing unnecessary code
2021-09-15 14:59 ` [OE-core] " Steve Sakoman
@ 2021-09-15 15:06 ` Alexander Kanavin
2021-09-15 15:43 ` Ranjitsinh Rathod
0 siblings, 1 reply; 8+ messages in thread
From: Alexander Kanavin @ 2021-09-15 15:06 UTC (permalink / raw)
To: Steve Sakoman
Cc: Ranjitsinh Rathod,
Patches and discussions about the oe-core layer,
Ranjitsinh Rathod
[-- Attachment #1: Type: text/plain, Size: 9545 bytes --]
At this point I have to note that I am removing the patch altogether with
the upcoming upgrade of rpm to 4.17, as I'm also switching the compression
format to zstd, and the patch is generally difficult to maintain and
rebase. If you care about xz compression, please do work with upstream to
get it merged there.
Alex
On Wed, 15 Sept 2021 at 16:59, Steve Sakoman <steve@sakoman.com> wrote:
> On Wed, Sep 8, 2021 at 4:02 AM Ranjitsinh Rathod
> <ranjitsinhrathod1991@gmail.com> wrote:
> >
> > From: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> >
> > Change in 2 patch as below to avoid critical issues
> > 1) 0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> > Handled return values of getrlimit() and lzma_cputhreads() functions
> > to avoid unexpected behaviours like devide by zero and potential read
> > of uninitialized variable 'virtual_memory'
> > Upstream-Status: Pending [merge of multithreading patches to upstream]
>
> This does look like a good fix. Are these changes to the patch from
> upstream?
>
> Once upstream has accepted the change we should change the status from
> "pending", but for now this is ok.
>
> > 2) CVE-2021-3421.patch
> > Removed RPMSIGTAG_FILESIGNATURES and RPMSIGTAG_FILESIGNATURELENGTH as
> > it is not needed during backporting of original patch.
> > Upstream-Status: Backport [
> https://github.com/rpm-software-management/rpm/commit/d6a86b5e69e46cc283b1e06c92343319beb42e21
> ]
>
> Removing these unused definitions doesn't really seem like a critical
> issue. I'd prefer to leave the CVE patch in its original form.
>
> Could you submit a V2 with this change?
>
> Thanks!
>
> Steve
>
> > Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> > ---
> > ...rict-virtual-memory-usage-if-limit-s.patch | 25 ++++++++-------
> > .../rpm/files/CVE-2021-3421.patch | 32 +++----------------
> > 2 files changed, 19 insertions(+), 38 deletions(-)
> >
> > diff --git
> a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> b/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> > index 6454785254..dc3f74fecd 100644
> > ---
> a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> > +++
> b/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> > @@ -11,36 +11,39 @@ CPU thread.
> > Upstream-Status: Pending [merge of multithreading patches to upstream]
> >
> > Signed-off-by: Peter Bergin <peter@berginkonsult.se>
> > +Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> > ---
> > - rpmio/rpmio.c | 34 ++++++++++++++++++++++++++++++++++
> > - 1 file changed, 34 insertions(+)
> > + rpmio/rpmio.c | 36 ++++++++++++++++++++++++++++++++++++
> > + 1 file changed, 36 insertions(+)
> >
> > diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
> > index e051c98..b3c56b6 100644
> > --- a/rpmio/rpmio.c
> > +++ b/rpmio/rpmio.c
> > -@@ -845,6 +845,40 @@ static LZFILE *lzopen_internal(const char *mode,
> int fd, int xz)
> > +@@ -845,6 +845,42 @@ static LZFILE *lzopen_internal(const char *mode,
> int fd, int xz)
> > }
> > #endif
> >
> > -+ struct rlimit virtual_memory;
> > -+ getrlimit(RLIMIT_AS, &virtual_memory);
> > -+ if (virtual_memory.rlim_cur != RLIM_INFINITY) {
> > ++ struct rlimit virtual_memory = {RLIM_INFINITY ,
> RLIM_INFINITY};
> > ++ int status = getrlimit(RLIMIT_AS, &virtual_memory);
> > ++ if ((status != -1) && (virtual_memory.rlim_cur !=
> RLIM_INFINITY)) {
> > + const uint64_t virtual_memlimit =
> virtual_memory.rlim_cur;
> > ++ uint32_t threads_max = lzma_cputhreads();
> > + const uint64_t virtual_memlimit_per_cpu_thread =
> > -+ virtual_memlimit / lzma_cputhreads();
> > -+ uint64_t memory_usage_virt;
> > ++ virtual_memlimit / ((threads_max == 0) ?
> 1 : threads_max);
> > + rpmlog(RPMLOG_NOTICE, "XZ: virtual memory
> restricted to %lu and "
> > + "per CPU thread %lu\n", virtual_memlimit,
> virtual_memlimit_per_cpu_thread);
> > ++ uint64_t memory_usage_virt;
> > + /* keep reducing the number of compression
> threads until memory
> > + usage falls below the limit per CPU thread*/
> > + while ((memory_usage_virt =
> lzma_stream_encoder_mt_memusage(&mt_options)) >
> > + virtual_memlimit_per_cpu_thread) {
> > -+ /* If number of threads goes down to
> zero lzma_stream_encoder will
> > -+ * will return UINT64_MAX. We must check
> here to avoid an infinite loop.
> > ++ /* If number of threads goes down to
> zero or in case of any other error
> > ++ * lzma_stream_encoder_mt_memusage will
> return UINT64_MAX. We must check
> > ++ * for both the cases here to avoid an
> infinite loop.
> > + * If we get into situation that one
> thread requires more virtual memory
> > + * than available we set one thread,
> print error message and try anyway. */
> > -+ if (--mt_options.threads == 0) {
> > ++ if ((--mt_options.threads == 0) ||
> (memory_usage_virt == UINT64_MAX)) {
> > + mt_options.threads = 1;
> > + rpmlog(RPMLOG_WARNING,
> > + "XZ: Could not adjust
> number of threads to get below "
> > diff --git a/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> b/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> > index b1a05b6863..d2ad5eabac 100644
> > --- a/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> > +++ b/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> > @@ -22,16 +22,16 @@ Fixes: CVE-2021-3421, CVE-2021-20271
> > Upstream-Status: Backport [
> https://github.com/rpm-software-management/rpm/commit/d6a86b5e69e46cc283b1e06c92343319beb42e21
> ]
> > CVE: CVE-2021-3421
> > Signed-off-by: Minjae Kim <flowergom@gmail.com>
> > +Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> > ---
> > - lib/package.c | 115 ++++++++++++++++++++++++--------------------------
> > - lib/rpmtag.h | 4 ++
> > - 2 files changed, 58 insertions(+), 61 deletions(-)
> > + lib/package.c | 113 ++++++++++++++++++++++++--------------------------
> > + 1 file changed, 52 insertions(+), 61 deletions(-)
> >
> > diff --git a/lib/package.c b/lib/package.c
> > index 081123d84e..7c26ea323f 100644
> > --- a/lib/package.c
> > +++ b/lib/package.c
> > -@@ -20,76 +20,68 @@
> > +@@ -20,76 +20,67 @@
> >
> > #include "debug.h"
> >
> > @@ -46,8 +46,6 @@ index 081123d84e..7c26ea323f 100644
> > + { RPMSIGTAG_GPG, RPMTAG_SIGGPG, 0 },
> > + /* { RPMSIGTAG_PGP5, RPMTAG_SIGPGP5, 0 }, */ /* long obsolete,
> dont use */
> > + { RPMSIGTAG_PAYLOADSIZE, RPMTAG_ARCHIVESIZE, 1 },
> > -+ { RPMSIGTAG_FILESIGNATURES, RPMTAG_FILESIGNATURES, 0 },
> > -+ { RPMSIGTAG_FILESIGNATURELENGTH, RPMTAG_FILESIGNATURELENGTH, 1 },
> > + { RPMSIGTAG_SHA1, RPMTAG_SHA1HEADER, 1 },
> > + { RPMSIGTAG_SHA256, RPMTAG_SHA256HEADER, 1 },
> > + { RPMSIGTAG_DSA, RPMTAG_DSAHEADER, 0 },
> > @@ -61,6 +59,7 @@ index 081123d84e..7c26ea323f 100644
> > * Translate and merge legacy signature tags into header.
> > * @param h header (dest)
> > * @param sigh signature header (src)
> > ++ * @return failing tag number, 0 on success
> > */
> > static
> > -void headerMergeLegacySigs(Header h, Header sigh)
> > @@ -170,27 +169,6 @@ index 081123d84e..7c26ea323f 100644
> > applyRetrofits(h);
> >
> > /* Bump reference count for return. */
> > -diff --git a/lib/rpmtag.h b/lib/rpmtag.h
> > -index 8c718b31b5..d562572c6f 100644
> > ---- a/lib/rpmtag.h
> > -+++ b/lib/rpmtag.h
> > -@@ -65,6 +65,8 @@ typedef enum rpmTag_e {
> > - RPMTAG_LONGARCHIVESIZE = RPMTAG_SIG_BASE+15, /* l */
> > - /* RPMTAG_SIG_BASE+16 reserved */
> > - RPMTAG_SHA256HEADER = RPMTAG_SIG_BASE+17, /* s */
> > -+ /* RPMTAG_SIG_BASE+18 reserved for RPMSIGTAG_FILESIGNATURES */
> > -+ /* RPMTAG_SIG_BASE+19 reserved for RPMSIGTAG_FILESIGNATURELENGTH */
> > -
> > - RPMTAG_NAME = 1000, /* s */
> > - #define RPMTAG_N RPMTAG_NAME /* s */
> > -@@ -422,6 +424,8 @@ typedef enum rpmSigTag_e {
> > - RPMSIGTAG_LONGSIZE = RPMTAG_LONGSIGSIZE, /*!< internal
> Header+Payload size (64bit) in bytes. */
> > - RPMSIGTAG_LONGARCHIVESIZE = RPMTAG_LONGARCHIVESIZE, /*!< internal
> uncompressed payload size (64bit) in bytes. */
> > - RPMSIGTAG_SHA256 = RPMTAG_SHA256HEADER,
> > -+ RPMSIGTAG_FILESIGNATURES = RPMTAG_SIG_BASE + 18,
> > -+ RPMSIGTAG_FILESIGNATURELENGTH = RPMTAG_SIG_BASE + 19,
> > - } rpmSigTag;
> > -
> >
> > --
> > 2.17.1
> > --
> > 2.17.1
> >
> >
> >
> >
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 12024 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [meta][dunfell][PATCH] rpm: Handle proper return value to avoid major issues and removing unnecessary code
2021-09-15 15:06 ` Alexander Kanavin
@ 2021-09-15 15:43 ` Ranjitsinh Rathod
2021-09-15 15:51 ` Steve Sakoman
0 siblings, 1 reply; 8+ messages in thread
From: Ranjitsinh Rathod @ 2021-09-15 15:43 UTC (permalink / raw)
To: Steve Sakoman, alex.kanavin
Cc: Ranjitsinh Rathod, Patches and discussions about the oe-core layer
[-- Attachment #1.1: Type: text/plain, Size: 12432 bytes --]
Hi Steve,
If you wanted to take changes only for the 0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch then you can cherry-pick it from master as I have submitted it for master and it is available on master branch now. Below is the link.
poky - Poky Build Tool and Metadata (yoctoproject.org)<https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=9886ef691aa117d67e4342c6a5e3f79f6a05f8d5>
Do you still want me to send v2 patch here?
Thanks,
Best Regards,
Ranjitsinh Rathod
Technical Leader | | KPIT Technologies Ltd.
Cellphone: +91-84606 92403
__________________________________________
KPIT<http://www.kpit.com/> | Follow us on LinkedIn<http://www.kpit.com/linkedin>
[cid:05fb0115-01bd-4421-ae2f-587c78415386]<https://www.kpit.com/TheNewBrand>
________________________________
From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> on behalf of Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org>
Sent: Wednesday, September 15, 2021 8:36 PM
To: Steve Sakoman <steve@sakoman.com>
Cc: Ranjitsinh Rathod <ranjitsinhrathod1991@gmail.com>; Patches and discussions about the oe-core layer <openembedded-core@lists.openembedded.org>; Ranjitsinh Rathod <Ranjitsinh.Rathod@kpit.com>
Subject: Re: [OE-core] [meta][dunfell][PATCH] rpm: Handle proper return value to avoid major issues and removing unnecessary code
Caution: This email originated from outside of the KPIT. Do not click links or open attachments unless you recognize the sender and know the content is safe.
At this point I have to note that I am removing the patch altogether with the upcoming upgrade of rpm to 4.17, as I'm also switching the compression format to zstd, and the patch is generally difficult to maintain and rebase. If you care about xz compression, please do work with upstream to get it merged there.
Alex
On Wed, 15 Sept 2021 at 16:59, Steve Sakoman <steve@sakoman.com<mailto:steve@sakoman.com>> wrote:
On Wed, Sep 8, 2021 at 4:02 AM Ranjitsinh Rathod
<ranjitsinhrathod1991@gmail.com<mailto:ranjitsinhrathod1991@gmail.com>> wrote:
>
> From: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com<mailto:ranjitsinh.rathod@kpit.com>>
>
> Change in 2 patch as below to avoid critical issues
> 1) 0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> Handled return values of getrlimit() and lzma_cputhreads() functions
> to avoid unexpected behaviours like devide by zero and potential read
> of uninitialized variable 'virtual_memory'
> Upstream-Status: Pending [merge of multithreading patches to upstream]
This does look like a good fix. Are these changes to the patch from upstream?
Once upstream has accepted the change we should change the status from
"pending", but for now this is ok.
> 2) CVE-2021-3421.patch
> Removed RPMSIGTAG_FILESIGNATURES and RPMSIGTAG_FILESIGNATURELENGTH as
> it is not needed during backporting of original patch.
> Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/d6a86b5e69e46cc283b1e06c92343319beb42e21<https://apc01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Frpm-software-management%2Frpm%2Fcommit%2Fd6a86b5e69e46cc283b1e06c92343319beb42e21&data=04%7C01%7Cranjitsinh.rathod%40kpit.com%7Cdfd54731b1a240ea64ed08d9785a7618%7C3539451eb46e4a26a242ff61502855c7%7C0%7C0%7C637673152237746428%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=BFoFI3j9RjhqXQi1tSqfoVoS2strOChMcswosTH59Fs%3D&reserved=0>]
Removing these unused definitions doesn't really seem like a critical
issue. I'd prefer to leave the CVE patch in its original form.
Could you submit a V2 with this change?
Thanks!
Steve
> Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com<mailto:ranjitsinh.rathod@kpit.com>>
> ---
> ...rict-virtual-memory-usage-if-limit-s.patch | 25 ++++++++-------
> .../rpm/files/CVE-2021-3421.patch | 32 +++----------------
> 2 files changed, 19 insertions(+), 38 deletions(-)
>
> diff --git a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch b/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> index 6454785254..dc3f74fecd 100644
> --- a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> +++ b/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> @@ -11,36 +11,39 @@ CPU thread.
> Upstream-Status: Pending [merge of multithreading patches to upstream]
>
> Signed-off-by: Peter Bergin <peter@berginkonsult.se<mailto:peter@berginkonsult.se>>
> +Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com<mailto:ranjitsinh.rathod@kpit.com>>
> ---
> - rpmio/rpmio.c | 34 ++++++++++++++++++++++++++++++++++
> - 1 file changed, 34 insertions(+)
> + rpmio/rpmio.c | 36 ++++++++++++++++++++++++++++++++++++
> + 1 file changed, 36 insertions(+)
>
> diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
> index e051c98..b3c56b6 100644
> --- a/rpmio/rpmio.c
> +++ b/rpmio/rpmio.c
> -@@ -845,6 +845,40 @@ static LZFILE *lzopen_internal(const char *mode, int fd, int xz)
> +@@ -845,6 +845,42 @@ static LZFILE *lzopen_internal(const char *mode, int fd, int xz)
> }
> #endif
>
> -+ struct rlimit virtual_memory;
> -+ getrlimit(RLIMIT_AS, &virtual_memory);
> -+ if (virtual_memory.rlim_cur != RLIM_INFINITY) {
> ++ struct rlimit virtual_memory = {RLIM_INFINITY , RLIM_INFINITY};
> ++ int status = getrlimit(RLIMIT_AS, &virtual_memory);
> ++ if ((status != -1) && (virtual_memory.rlim_cur != RLIM_INFINITY)) {
> + const uint64_t virtual_memlimit = virtual_memory.rlim_cur;
> ++ uint32_t threads_max = lzma_cputhreads();
> + const uint64_t virtual_memlimit_per_cpu_thread =
> -+ virtual_memlimit / lzma_cputhreads();
> -+ uint64_t memory_usage_virt;
> ++ virtual_memlimit / ((threads_max == 0) ? 1 : threads_max);
> + rpmlog(RPMLOG_NOTICE, "XZ: virtual memory restricted to %lu and "
> + "per CPU thread %lu\n", virtual_memlimit, virtual_memlimit_per_cpu_thread);
> ++ uint64_t memory_usage_virt;
> + /* keep reducing the number of compression threads until memory
> + usage falls below the limit per CPU thread*/
> + while ((memory_usage_virt = lzma_stream_encoder_mt_memusage(&mt_options)) >
> + virtual_memlimit_per_cpu_thread) {
> -+ /* If number of threads goes down to zero lzma_stream_encoder will
> -+ * will return UINT64_MAX. We must check here to avoid an infinite loop.
> ++ /* If number of threads goes down to zero or in case of any other error
> ++ * lzma_stream_encoder_mt_memusage will return UINT64_MAX. We must check
> ++ * for both the cases here to avoid an infinite loop.
> + * If we get into situation that one thread requires more virtual memory
> + * than available we set one thread, print error message and try anyway. */
> -+ if (--mt_options.threads == 0) {
> ++ if ((--mt_options.threads == 0) || (memory_usage_virt == UINT64_MAX)) {
> + mt_options.threads = 1;
> + rpmlog(RPMLOG_WARNING,
> + "XZ: Could not adjust number of threads to get below "
> diff --git a/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch b/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> index b1a05b6863..d2ad5eabac 100644
> --- a/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> +++ b/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> @@ -22,16 +22,16 @@ Fixes: CVE-2021-3421, CVE-2021-20271
> Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/d6a86b5e69e46cc283b1e06c92343319beb42e21<https://apc01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Frpm-software-management%2Frpm%2Fcommit%2Fd6a86b5e69e46cc283b1e06c92343319beb42e21&data=04%7C01%7Cranjitsinh.rathod%40kpit.com%7Cdfd54731b1a240ea64ed08d9785a7618%7C3539451eb46e4a26a242ff61502855c7%7C0%7C0%7C637673152237746428%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=BFoFI3j9RjhqXQi1tSqfoVoS2strOChMcswosTH59Fs%3D&reserved=0>]
> CVE: CVE-2021-3421
> Signed-off-by: Minjae Kim <flowergom@gmail.com<mailto:flowergom@gmail.com>>
> +Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com<mailto:ranjitsinh.rathod@kpit.com>>
> ---
> - lib/package.c | 115 ++++++++++++++++++++++++--------------------------
> - lib/rpmtag.h | 4 ++
> - 2 files changed, 58 insertions(+), 61 deletions(-)
> + lib/package.c | 113 ++++++++++++++++++++++++--------------------------
> + 1 file changed, 52 insertions(+), 61 deletions(-)
>
> diff --git a/lib/package.c b/lib/package.c
> index 081123d84e..7c26ea323f 100644
> --- a/lib/package.c
> +++ b/lib/package.c
> -@@ -20,76 +20,68 @@
> +@@ -20,76 +20,67 @@
>
> #include "debug.h"
>
> @@ -46,8 +46,6 @@ index 081123d84e..7c26ea323f 100644
> + { RPMSIGTAG_GPG, RPMTAG_SIGGPG, 0 },
> + /* { RPMSIGTAG_PGP5, RPMTAG_SIGPGP5, 0 }, */ /* long obsolete, dont use */
> + { RPMSIGTAG_PAYLOADSIZE, RPMTAG_ARCHIVESIZE, 1 },
> -+ { RPMSIGTAG_FILESIGNATURES, RPMTAG_FILESIGNATURES, 0 },
> -+ { RPMSIGTAG_FILESIGNATURELENGTH, RPMTAG_FILESIGNATURELENGTH, 1 },
> + { RPMSIGTAG_SHA1, RPMTAG_SHA1HEADER, 1 },
> + { RPMSIGTAG_SHA256, RPMTAG_SHA256HEADER, 1 },
> + { RPMSIGTAG_DSA, RPMTAG_DSAHEADER, 0 },
> @@ -61,6 +59,7 @@ index 081123d84e..7c26ea323f 100644
> * Translate and merge legacy signature tags into header.
> * @param h header (dest)
> * @param sigh signature header (src)
> ++ * @return failing tag number, 0 on success
> */
> static
> -void headerMergeLegacySigs(Header h, Header sigh)
> @@ -170,27 +169,6 @@ index 081123d84e..7c26ea323f 100644
> applyRetrofits(h);
>
> /* Bump reference count for return. */
> -diff --git a/lib/rpmtag.h b/lib/rpmtag.h
> -index 8c718b31b5..d562572c6f 100644
> ---- a/lib/rpmtag.h
> -+++ b/lib/rpmtag.h
> -@@ -65,6 +65,8 @@ typedef enum rpmTag_e {
> - RPMTAG_LONGARCHIVESIZE = RPMTAG_SIG_BASE+15, /* l */
> - /* RPMTAG_SIG_BASE+16 reserved */
> - RPMTAG_SHA256HEADER = RPMTAG_SIG_BASE+17, /* s */
> -+ /* RPMTAG_SIG_BASE+18 reserved for RPMSIGTAG_FILESIGNATURES */
> -+ /* RPMTAG_SIG_BASE+19 reserved for RPMSIGTAG_FILESIGNATURELENGTH */
> -
> - RPMTAG_NAME = 1000, /* s */
> - #define RPMTAG_N RPMTAG_NAME /* s */
> -@@ -422,6 +424,8 @@ typedef enum rpmSigTag_e {
> - RPMSIGTAG_LONGSIZE = RPMTAG_LONGSIGSIZE, /*!< internal Header+Payload size (64bit) in bytes. */
> - RPMSIGTAG_LONGARCHIVESIZE = RPMTAG_LONGARCHIVESIZE, /*!< internal uncompressed payload size (64bit) in bytes. */
> - RPMSIGTAG_SHA256 = RPMTAG_SHA256HEADER,
> -+ RPMSIGTAG_FILESIGNATURES = RPMTAG_SIG_BASE + 18,
> -+ RPMSIGTAG_FILESIGNATURELENGTH = RPMTAG_SIG_BASE + 19,
> - } rpmSigTag;
> -
>
> --
> 2.17.1
> --
> 2.17.1
>
>
>
>
This message contains information that may be privileged or confidential and is the property of the KPIT Technologies Ltd. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. KPIT Technologies Ltd. does not accept any liability for virus infected mails.
[-- Attachment #1.2: Type: text/html, Size: 23111 bytes --]
[-- Attachment #2: Outlook-mo3huikm.png --]
[-- Type: image/png, Size: 22485 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [meta][dunfell][PATCH] rpm: Handle proper return value to avoid major issues and removing unnecessary code
2021-09-15 15:43 ` Ranjitsinh Rathod
@ 2021-09-15 15:51 ` Steve Sakoman
0 siblings, 0 replies; 8+ messages in thread
From: Steve Sakoman @ 2021-09-15 15:51 UTC (permalink / raw)
To: Ranjitsinh Rathod
Cc: alex.kanavin, Ranjitsinh Rathod,
Patches and discussions about the oe-core layer
[-- Attachment #1.1: Type: text/plain, Size: 12880 bytes --]
On Wed, Sep 15, 2021 at 5:43 AM Ranjitsinh Rathod <
Ranjitsinh.Rathod@kpit.com> wrote:
> Hi Steve,
>
> If you wanted to take changes only for the 0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> then you can cherry-pick it from master as I have submitted it for master
> and it is available on master branch now. Below is the link.
> poky - Poky Build Tool and Metadata (yoctoproject.org)
> <https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=9886ef691aa117d67e4342c6a5e3f79f6a05f8d5>
>
> Do you still want me to send v2 patch here?
>
No need, I'll cherry-pick the patch from master.
Thanks!
Steve
>
> Thanks,
>
> Best Regards,
>
> *Ranjitsinh Rathod*
> Technical Leader | | KPIT Technologies Ltd.
> Cellphone: +91-84606 92403
>
> *__________________________________________ *KPIT <http://www.kpit.com/> |
> Follow us on LinkedIn <http://www.kpit.com/linkedin>
>
> <https://www.kpit.com/TheNewBrand>
> ------------------------------
> *From:* openembedded-core@lists.openembedded.org <
> openembedded-core@lists.openembedded.org> on behalf of Alexander Kanavin
> via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org>
> *Sent:* Wednesday, September 15, 2021 8:36 PM
> *To:* Steve Sakoman <steve@sakoman.com>
> *Cc:* Ranjitsinh Rathod <ranjitsinhrathod1991@gmail.com>; Patches and
> discussions about the oe-core layer <
> openembedded-core@lists.openembedded.org>; Ranjitsinh Rathod <
> Ranjitsinh.Rathod@kpit.com>
> *Subject:* Re: [OE-core] [meta][dunfell][PATCH] rpm: Handle proper return
> value to avoid major issues and removing unnecessary code
>
> Caution: This email originated from outside of the KPIT. Do not click
> links or open attachments unless you recognize the sender and know the
> content is safe.
> At this point I have to note that I am removing the patch altogether with
> the upcoming upgrade of rpm to 4.17, as I'm also switching the compression
> format to zstd, and the patch is generally difficult to maintain and
> rebase. If you care about xz compression, please do work with upstream to
> get it merged there.
>
> Alex
>
> On Wed, 15 Sept 2021 at 16:59, Steve Sakoman <steve@sakoman.com> wrote:
>
> On Wed, Sep 8, 2021 at 4:02 AM Ranjitsinh Rathod
> <ranjitsinhrathod1991@gmail.com> wrote:
> >
> > From: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> >
> > Change in 2 patch as below to avoid critical issues
> > 1) 0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> > Handled return values of getrlimit() and lzma_cputhreads() functions
> > to avoid unexpected behaviours like devide by zero and potential read
> > of uninitialized variable 'virtual_memory'
> > Upstream-Status: Pending [merge of multithreading patches to upstream]
>
> This does look like a good fix. Are these changes to the patch from
> upstream?
>
> Once upstream has accepted the change we should change the status from
> "pending", but for now this is ok.
>
> > 2) CVE-2021-3421.patch
> > Removed RPMSIGTAG_FILESIGNATURES and RPMSIGTAG_FILESIGNATURELENGTH as
> > it is not needed during backporting of original patch.
> > Upstream-Status: Backport [
> https://github.com/rpm-software-management/rpm/commit/d6a86b5e69e46cc283b1e06c92343319beb42e21
> <https://apc01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Frpm-software-management%2Frpm%2Fcommit%2Fd6a86b5e69e46cc283b1e06c92343319beb42e21&data=04%7C01%7Cranjitsinh.rathod%40kpit.com%7Cdfd54731b1a240ea64ed08d9785a7618%7C3539451eb46e4a26a242ff61502855c7%7C0%7C0%7C637673152237746428%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=BFoFI3j9RjhqXQi1tSqfoVoS2strOChMcswosTH59Fs%3D&reserved=0>
> ]
>
> Removing these unused definitions doesn't really seem like a critical
> issue. I'd prefer to leave the CVE patch in its original form.
>
> Could you submit a V2 with this change?
>
> Thanks!
>
> Steve
>
> > Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> > ---
> > ...rict-virtual-memory-usage-if-limit-s.patch | 25 ++++++++-------
> > .../rpm/files/CVE-2021-3421.patch | 32 +++----------------
> > 2 files changed, 19 insertions(+), 38 deletions(-)
> >
> > diff --git
> a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> b/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> > index 6454785254..dc3f74fecd 100644
> > ---
> a/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> > +++
> b/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch
> > @@ -11,36 +11,39 @@ CPU thread.
> > Upstream-Status: Pending [merge of multithreading patches to upstream]
> >
> > Signed-off-by: Peter Bergin <peter@berginkonsult.se>
> > +Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> > ---
> > - rpmio/rpmio.c | 34 ++++++++++++++++++++++++++++++++++
> > - 1 file changed, 34 insertions(+)
> > + rpmio/rpmio.c | 36 ++++++++++++++++++++++++++++++++++++
> > + 1 file changed, 36 insertions(+)
> >
> > diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
> > index e051c98..b3c56b6 100644
> > --- a/rpmio/rpmio.c
> > +++ b/rpmio/rpmio.c
> > -@@ -845,6 +845,40 @@ static LZFILE *lzopen_internal(const char *mode,
> int fd, int xz)
> > +@@ -845,6 +845,42 @@ static LZFILE *lzopen_internal(const char *mode,
> int fd, int xz)
> > }
> > #endif
> >
> > -+ struct rlimit virtual_memory;
> > -+ getrlimit(RLIMIT_AS, &virtual_memory);
> > -+ if (virtual_memory.rlim_cur != RLIM_INFINITY) {
> > ++ struct rlimit virtual_memory = {RLIM_INFINITY ,
> RLIM_INFINITY};
> > ++ int status = getrlimit(RLIMIT_AS, &virtual_memory);
> > ++ if ((status != -1) && (virtual_memory.rlim_cur !=
> RLIM_INFINITY)) {
> > + const uint64_t virtual_memlimit =
> virtual_memory.rlim_cur;
> > ++ uint32_t threads_max = lzma_cputhreads();
> > + const uint64_t virtual_memlimit_per_cpu_thread =
> > -+ virtual_memlimit / lzma_cputhreads();
> > -+ uint64_t memory_usage_virt;
> > ++ virtual_memlimit / ((threads_max == 0) ?
> 1 : threads_max);
> > + rpmlog(RPMLOG_NOTICE, "XZ: virtual memory
> restricted to %lu and "
> > + "per CPU thread %lu\n", virtual_memlimit,
> virtual_memlimit_per_cpu_thread);
> > ++ uint64_t memory_usage_virt;
> > + /* keep reducing the number of compression
> threads until memory
> > + usage falls below the limit per CPU thread*/
> > + while ((memory_usage_virt =
> lzma_stream_encoder_mt_memusage(&mt_options)) >
> > + virtual_memlimit_per_cpu_thread) {
> > -+ /* If number of threads goes down to
> zero lzma_stream_encoder will
> > -+ * will return UINT64_MAX. We must check
> here to avoid an infinite loop.
> > ++ /* If number of threads goes down to
> zero or in case of any other error
> > ++ * lzma_stream_encoder_mt_memusage will
> return UINT64_MAX. We must check
> > ++ * for both the cases here to avoid an
> infinite loop.
> > + * If we get into situation that one
> thread requires more virtual memory
> > + * than available we set one thread,
> print error message and try anyway. */
> > -+ if (--mt_options.threads == 0) {
> > ++ if ((--mt_options.threads == 0) ||
> (memory_usage_virt == UINT64_MAX)) {
> > + mt_options.threads = 1;
> > + rpmlog(RPMLOG_WARNING,
> > + "XZ: Could not adjust
> number of threads to get below "
> > diff --git a/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> b/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> > index b1a05b6863..d2ad5eabac 100644
> > --- a/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> > +++ b/meta/recipes-devtools/rpm/files/CVE-2021-3421.patch
> > @@ -22,16 +22,16 @@ Fixes: CVE-2021-3421, CVE-2021-20271
> > Upstream-Status: Backport [
> https://github.com/rpm-software-management/rpm/commit/d6a86b5e69e46cc283b1e06c92343319beb42e21
> <https://apc01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Frpm-software-management%2Frpm%2Fcommit%2Fd6a86b5e69e46cc283b1e06c92343319beb42e21&data=04%7C01%7Cranjitsinh.rathod%40kpit.com%7Cdfd54731b1a240ea64ed08d9785a7618%7C3539451eb46e4a26a242ff61502855c7%7C0%7C0%7C637673152237746428%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=BFoFI3j9RjhqXQi1tSqfoVoS2strOChMcswosTH59Fs%3D&reserved=0>
> ]
> > CVE: CVE-2021-3421
> > Signed-off-by: Minjae Kim <flowergom@gmail.com>
> > +Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
> > ---
> > - lib/package.c | 115 ++++++++++++++++++++++++--------------------------
> > - lib/rpmtag.h | 4 ++
> > - 2 files changed, 58 insertions(+), 61 deletions(-)
> > + lib/package.c | 113 ++++++++++++++++++++++++--------------------------
> > + 1 file changed, 52 insertions(+), 61 deletions(-)
> >
> > diff --git a/lib/package.c b/lib/package.c
> > index 081123d84e..7c26ea323f 100644
> > --- a/lib/package.c
> > +++ b/lib/package.c
> > -@@ -20,76 +20,68 @@
> > +@@ -20,76 +20,67 @@
> >
> > #include "debug.h"
> >
> > @@ -46,8 +46,6 @@ index 081123d84e..7c26ea323f 100644
> > + { RPMSIGTAG_GPG, RPMTAG_SIGGPG, 0 },
> > + /* { RPMSIGTAG_PGP5, RPMTAG_SIGPGP5, 0 }, */ /* long obsolete,
> dont use */
> > + { RPMSIGTAG_PAYLOADSIZE, RPMTAG_ARCHIVESIZE, 1 },
> > -+ { RPMSIGTAG_FILESIGNATURES, RPMTAG_FILESIGNATURES, 0 },
> > -+ { RPMSIGTAG_FILESIGNATURELENGTH, RPMTAG_FILESIGNATURELENGTH, 1 },
> > + { RPMSIGTAG_SHA1, RPMTAG_SHA1HEADER, 1 },
> > + { RPMSIGTAG_SHA256, RPMTAG_SHA256HEADER, 1 },
> > + { RPMSIGTAG_DSA, RPMTAG_DSAHEADER, 0 },
> > @@ -61,6 +59,7 @@ index 081123d84e..7c26ea323f 100644
> > * Translate and merge legacy signature tags into header.
> > * @param h header (dest)
> > * @param sigh signature header (src)
> > ++ * @return failing tag number, 0 on success
> > */
> > static
> > -void headerMergeLegacySigs(Header h, Header sigh)
> > @@ -170,27 +169,6 @@ index 081123d84e..7c26ea323f 100644
> > applyRetrofits(h);
> >
> > /* Bump reference count for return. */
> > -diff --git a/lib/rpmtag.h b/lib/rpmtag.h
> > -index 8c718b31b5..d562572c6f 100644
> > ---- a/lib/rpmtag.h
> > -+++ b/lib/rpmtag.h
> > -@@ -65,6 +65,8 @@ typedef enum rpmTag_e {
> > - RPMTAG_LONGARCHIVESIZE = RPMTAG_SIG_BASE+15, /* l */
> > - /* RPMTAG_SIG_BASE+16 reserved */
> > - RPMTAG_SHA256HEADER = RPMTAG_SIG_BASE+17, /* s */
> > -+ /* RPMTAG_SIG_BASE+18 reserved for RPMSIGTAG_FILESIGNATURES */
> > -+ /* RPMTAG_SIG_BASE+19 reserved for RPMSIGTAG_FILESIGNATURELENGTH */
> > -
> > - RPMTAG_NAME = 1000, /* s */
> > - #define RPMTAG_N RPMTAG_NAME /* s */
> > -@@ -422,6 +424,8 @@ typedef enum rpmSigTag_e {
> > - RPMSIGTAG_LONGSIZE = RPMTAG_LONGSIGSIZE, /*!< internal
> Header+Payload size (64bit) in bytes. */
> > - RPMSIGTAG_LONGARCHIVESIZE = RPMTAG_LONGARCHIVESIZE, /*!< internal
> uncompressed payload size (64bit) in bytes. */
> > - RPMSIGTAG_SHA256 = RPMTAG_SHA256HEADER,
> > -+ RPMSIGTAG_FILESIGNATURES = RPMTAG_SIG_BASE + 18,
> > -+ RPMSIGTAG_FILESIGNATURELENGTH = RPMTAG_SIG_BASE + 19,
> > - } rpmSigTag;
> > -
> >
> > --
> > 2.17.1
> > --
> > 2.17.1
> >
> >
> >
> >
>
>
>
> This message contains information that may be privileged or confidential
> and is the property of the KPIT Technologies Ltd. It is intended only for
> the person to whom it is addressed. If you are not the intended recipient,
> you are not authorized to read, print, retain copy, disseminate,
> distribute, or use this message or any part thereof. If you receive this
> message in error, please notify the sender immediately and delete all
> copies of this message. KPIT Technologies Ltd. does not accept any
> liability for virus infected mails.
>
[-- Attachment #1.2: Type: text/html, Size: 20844 bytes --]
[-- Attachment #2: Outlook-mo3huikm.png --]
[-- Type: image/png, Size: 22485 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-09-15 15:51 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-08 14:02 [meta][dunfell][PATCH] rpm: Handle proper return value to avoid major issues and removing unnecessary code Ranjitsinh Rathod
2021-09-13 15:54 ` Ranjitsinh Rathod
2021-09-13 18:34 ` [OE-core] " Steve Sakoman
2021-09-14 0:15 ` Minjae Kim
2021-09-15 14:59 ` [OE-core] " Steve Sakoman
2021-09-15 15:06 ` Alexander Kanavin
2021-09-15 15:43 ` Ranjitsinh Rathod
2021-09-15 15:51 ` Steve Sakoman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.