| Message ID | 20231120013359.814059-1-a869920004@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [RESEND,v2] sign-file: Fix incorrect return values check | expand |
On Mon Nov 20, 2023 at 3:33 AM EET, Yusong Gao wrote: > There are some wrong return values check in sign-file when call OpenSSL > API. For example the CMS_final() return 1 for success or 0 for failure. Why not make it a closed sentence and list the functions that need to be changed? > The ERR() check cond is wrong because of the program only check the > return value is < 0 instead of <= 0. > Lacking Fixes tag(s). See: ttps://www.kernel.org/doc/html/latest/process/submitting-patches.html > Link: > https://www.openssl.org/docs/manmaster/man3/CMS_final.html > https://www.openssl.org/docs/manmaster/man3/i2d_CMS_bio_stream.html > https://www.openssl.org/docs/manmaster/man3/i2d_PKCS7_bio.html > https://www.openssl.org/docs/manmaster/man3/BIO_free.html Replace with Link: https://www.openssl.org/docs/manmaster/man3/ BR, Jarkko
On Tue, Nov 21, 2023 at 7:44 AM Jarkko Sakkinen <jarkko@kernel.org> wrote: > > On Mon Nov 20, 2023 at 3:33 AM EET, Yusong Gao wrote: > > There are some wrong return values check in sign-file when call > > OpenSSL > > API. For example the CMS_final() return 1 for success or 0 for > > failure. > > Why not make it a closed sentence and list the functions that need to > be > changed? > > > The ERR() check cond is wrong because of the program only check the > > return value is < 0 instead of <= 0. > > > > Lacking Fixes tag(s). See: > ttps://www.kernel.org/doc/html/latest/process/submitting-patches.html > > > Link: > > https://www.openssl.org/docs/manmaster/man3/CMS_final.html > > https://www.openssl.org/docs/manmaster/man3/i2d_CMS_bio_stream.html > > https://www.openssl.org/docs/manmaster/man3/i2d_PKCS7_bio.html > > https://www.openssl.org/docs/manmaster/man3/BIO_free.html > > Replace with > > Link: https://www.openssl.org/docs/manmaster/man3/ > > BR, Jarkko Thanks a lot for you comments, I will fix that. BR, Yusong Gao
diff --git a/scripts/sign-file.c b/scripts/sign-file.c index 598ef5465f82..dcebbcd6bebd 100644 --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -322,7 +322,7 @@ int main(int argc, char **argv) CMS_NOSMIMECAP | use_keyid | use_signed_attrs), "CMS_add1_signer"); - ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) < 0, + ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) <= 0, "CMS_final"); #else @@ -341,10 +341,10 @@ int main(int argc, char **argv) b = BIO_new_file(sig_file_name, "wb"); ERR(!b, "%s", sig_file_name); #ifndef USE_PKCS7 - ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) < 0, + ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) <= 0, "%s", sig_file_name); #else - ERR(i2d_PKCS7_bio(b, pkcs7) < 0, + ERR(i2d_PKCS7_bio(b, pkcs7) <= 0, "%s", sig_file_name); #endif BIO_free(b); @@ -374,9 +374,9 @@ int main(int argc, char **argv) if (!raw_sig) { #ifndef USE_PKCS7 - ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) < 0, "%s", dest_name); + ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) <= 0, "%s", dest_name); #else - ERR(i2d_PKCS7_bio(bd, pkcs7) < 0, "%s", dest_name); + ERR(i2d_PKCS7_bio(bd, pkcs7) <= 0, "%s", dest_name); #endif } else { BIO *b; @@ -396,7 +396,7 @@ int main(int argc, char **argv) ERR(BIO_write(bd, &sig_info, sizeof(sig_info)) < 0, "%s", dest_name); ERR(BIO_write(bd, magic_number, sizeof(magic_number) - 1) < 0, "%s", dest_name); - ERR(BIO_free(bd) < 0, "%s", dest_name); + ERR(BIO_free(bd) <= 0, "%s", dest_name); /* Finally, if we're signing in place, replace the original. */ if (replace_orig)
There are some wrong return values check in sign-file when call OpenSSL API. For example the CMS_final() return 1 for success or 0 for failure. The ERR() check cond is wrong because of the program only check the return value is < 0 instead of <= 0. Link: https://www.openssl.org/docs/manmaster/man3/CMS_final.html https://www.openssl.org/docs/manmaster/man3/i2d_CMS_bio_stream.html https://www.openssl.org/docs/manmaster/man3/i2d_PKCS7_bio.html https://www.openssl.org/docs/manmaster/man3/BIO_free.html Signed-off-by: Yusong Gao <a869920004@gmail.com> --- scripts/sign-file.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)