tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

sign-file: Fix incorrect return values check

There are some wrong return values check in sign-file when call OpenSSL
API. The ERR() check cond is wrong because of the program only check the
return value is < 0 which ignored the return val is 0. For example:
1. CMS_final() return 1 for success or 0 for failure.
2. i2d_CMS_bio_stream() returns 1 for success or 0 for failure.
3. i2d_TYPEbio() return 1 for success and 0 for failure.
4. BIO_free() return 1 for success and 0 for failure.

Link: https://www.openssl.org/docs/manmaster/man3/
Fixes: e5a2e3c84782 ("scripts/sign-file.c: Add support for signing with a raw signature")
Signed-off-by: Yusong Gao <a869920004@gmail.com>
Reviewed-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/20231213024405.624692-1-a869920004@gmail.com/ # v5
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Yusong Gao and committed by
Linus Torvalds 82964944 5bd7ef53

+6 -6
+6 -6
scripts/sign-file.c
··· 322 322 CMS_NOSMIMECAP | use_keyid | 323 323 use_signed_attrs), 324 324 "CMS_add1_signer"); 325 - ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) < 0, 325 + ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) != 1, 326 326 "CMS_final"); 327 327 328 328 #else ··· 341 341 b = BIO_new_file(sig_file_name, "wb"); 342 342 ERR(!b, "%s", sig_file_name); 343 343 #ifndef USE_PKCS7 344 - ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) < 0, 344 + ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) != 1, 345 345 "%s", sig_file_name); 346 346 #else 347 - ERR(i2d_PKCS7_bio(b, pkcs7) < 0, 347 + ERR(i2d_PKCS7_bio(b, pkcs7) != 1, 348 348 "%s", sig_file_name); 349 349 #endif 350 350 BIO_free(b); ··· 374 374 375 375 if (!raw_sig) { 376 376 #ifndef USE_PKCS7 377 - ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) < 0, "%s", dest_name); 377 + ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) != 1, "%s", dest_name); 378 378 #else 379 - ERR(i2d_PKCS7_bio(bd, pkcs7) < 0, "%s", dest_name); 379 + ERR(i2d_PKCS7_bio(bd, pkcs7) != 1, "%s", dest_name); 380 380 #endif 381 381 } else { 382 382 BIO *b; ··· 396 396 ERR(BIO_write(bd, &sig_info, sizeof(sig_info)) < 0, "%s", dest_name); 397 397 ERR(BIO_write(bd, magic_number, sizeof(magic_number) - 1) < 0, "%s", dest_name); 398 398 399 - ERR(BIO_free(bd) < 0, "%s", dest_name); 399 + ERR(BIO_free(bd) != 1, "%s", dest_name); 400 400 401 401 /* Finally, if we're signing in place, replace the original. */ 402 402 if (replace_orig)