Fix the wrong IMA signature header check

This commit is contained in:
Huaxin Lu 2024-08-16 12:32:56 +08:00
parent 733c120d4a
commit 769ff26a6c
2 changed files with 5 additions and 2 deletions

View File

@ -424,7 +424,7 @@ index 0000000..c1864c7
+ return -EACCES;
+
+ /* Check if the signature has already included a header */
+ hdr_exist = (sig_size - sizeof(sig_hdr) % 128) == 0 ? 0 : 1;
+ hdr_exist = (st.st_size - sizeof(sig_hdr)) % 128 == 0 ? 1 : 0;
+ if (!hdr_exist) {
+ ret = fill_pgp_signature_header(te, sig_hdr);
+ if (ret < 0)

View File

@ -1,6 +1,6 @@
Name: rpm
Version: 4.17.0
Release: 41
Release: 42
Summary: RPM Package Manager
License: GPLv2+
URL: http://www.rpm.org/
@ -415,6 +415,9 @@ make check || (cat tests/rpmtests.log; exit 0)
%{_mandir}/man1/gendiff.1*
%changelog
* Tue Aug 20 2024 luhuaxin <luhuaxin1@huawei.com> - 4.17.0-42
- Fix the wrong IMA signature header check
* Mon Aug 19 2024 luhuaxin <luhuaxin1@huawei.com> - 4.17.0-41
- Fix the judgement of digests count