Dmitry Kasatkin <[email protected]> wrote:
> sign-file.c produce lots of annoying noise.
Compiling it manually with -Wformat-security found those problems you listed
and add -W found yet another problem. Differential patch attached. I've
folded it into the patch that adds sign-file.c.
David
---
diff --git a/scripts/sign-file.c b/scripts/sign-file.c
index 3f9bedbd185f..7941f499ddba 100755
--- a/scripts/sign-file.c
+++ b/scripts/sign-file.c
@@ -62,12 +62,12 @@ static void display_openssl_errors(int l)
}
-#define ERR(cond, ...) \
+#define ERR(cond, fmt, ...) \
do { \
bool __cond = (cond); \
display_openssl_errors(__LINE__); \
if (__cond) { \
- err(1, ## __VA_ARGS__); \
+ err(1, fmt, ## __VA_ARGS__); \
} \
} while(0)
@@ -133,7 +133,7 @@ int main(int argc, char **argv)
* across as we read it.
*/
bd = BIO_new_file(dest_name, "wb");
- ERR(!bd, dest_name);
+ ERR(!bd, "%s", dest_name);
/* Digest the module data. */
OpenSSL_add_all_digests();
@@ -149,7 +149,7 @@ int main(int argc, char **argv)
PKCS7_NOCERTS | PKCS7_PARTIAL | PKCS7_BINARY |
PKCS7_DETACHED | PKCS7_STREAM);
ERR(!pkcs7, "PKCS7_sign");
- ERR(PKCS7_sign_add_signer(pkcs7, x509, private_key, digest_algo,
PKCS7_NOCERTS | PKCS7_BINARY) < 0,
+ ERR(!PKCS7_sign_add_signer(pkcs7, x509, private_key, digest_algo,
PKCS7_NOCERTS | PKCS7_BINARY),
"PKCS7_sign_add_signer");
ERR(PKCS7_final(pkcs7, bm, PKCS7_NOCERTS | PKCS7_BINARY) < 0,
"PKCS7_final");
@@ -159,31 +159,31 @@ int main(int argc, char **argv)
ERR(asprintf(&pkcs7_name, "%s.pkcs7", module_name) < 0,
"asprintf");
b = BIO_new_file(pkcs7_name, "wb");
- ERR(!b, pkcs7_name);
- ERR(i2d_PKCS7_bio_stream(b, pkcs7, NULL, 0) < 0, pkcs7_name);
+ ERR(!b, "%s", pkcs7_name);
+ ERR(i2d_PKCS7_bio_stream(b, pkcs7, NULL, 0) < 0, "%s",
pkcs7_name);
BIO_free(b);
}
/* Append the marker and the PKCS#7 message to the destination file */
- ERR(BIO_reset(bm) < 0, module_name);
+ ERR(BIO_reset(bm) < 0, "%s", module_name);
while ((n = BIO_read(bm, buf, sizeof(buf))),
n > 0) {
- ERR(BIO_write(bd, buf, n) < 0, dest_name);
+ ERR(BIO_write(bd, buf, n) < 0, "%s", dest_name);
}
- ERR(n < 0, module_name);
+ ERR(n < 0, "%s", module_name);
module_size = BIO_number_written(bd);
- ERR(i2d_PKCS7_bio_stream(bd, pkcs7, NULL, 0) < 0, dest_name);
+ ERR(i2d_PKCS7_bio_stream(bd, pkcs7, NULL, 0) < 0, "%s", dest_name);
pkcs7_size = BIO_number_written(bd) - module_size;
sig_info.sig_len = htonl(pkcs7_size);
- ERR(BIO_write(bd, &sig_info, sizeof(sig_info)) < 0, dest_name);
- ERR(BIO_write(bd, magic_number, sizeof(magic_number) - 1) < 0,
dest_name);
+ 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, dest_name);
+ ERR(BIO_free(bd) < 0, "%s", dest_name);
/* Finally, if we're signing in place, replace the original. */
if (replace_orig)
- ERR(rename(dest_name, module_name) < 0, dest_name);
+ ERR(rename(dest_name, module_name) < 0, "%s", dest_name);
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
