Skip to content

Add GCC printf format checking for logging functions #625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtrojnar merged 1 commit into from
Nov 4, 2025
Merged

Add GCC printf format checking for logging functions #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/libp11-int.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,11 @@ extern char *pkcs11_strdup(char *, size_t);
#define EVP_PKEY_get0_EC_KEY(key) ((key)->pkey.ec)
#endif

extern void pkcs11_log(PKCS11_CTX_private *pctx, int level, const char *format, ...);
extern void pkcs11_log(PKCS11_CTX_private *pctx, int level, const char *format, ...)
#ifdef __GNUC__
__attribute__((format(printf, 3, 4)))
#endif
;

/* Reinitializing the module after fork (if detected) */
extern unsigned int get_forkid(void);
Expand Down
9 changes: 6 additions & 3 deletions src/provider.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ typedef struct {
/* Utility functions */
/******************************************************************************/

#ifdef __GNUC__
__attribute__((format(printf, 6, 7)))
#endif
static void PROVIDER_CTX_log(PROVIDER_CTX *prov_ctx, int level, int reason, int line, const char *file, const char *format, ...)
{
va_list args;
Expand Down Expand Up @@ -735,13 +738,13 @@ static int store_load(void *ctx, OSSL_CALLBACK *object_cb, void *object_cbarg,
int len = i2d_X509(cert, NULL);

if (len < 0) {
PROVIDER_CTX_log(store_ctx->prov_ctx, LOG_ERR, 4, OPENSSL_LINE, OPENSSL_FUNC, store_ctx->uri);
PROVIDER_CTX_log(store_ctx->prov_ctx, LOG_ERR, 4, OPENSSL_LINE, OPENSSL_FUNC, "%s", store_ctx->uri);
X509_free(cert);
return 0;
}
tmp = data = OPENSSL_malloc((size_t)len);
if (!tmp) {
PROVIDER_CTX_log(store_ctx->prov_ctx, LOG_ERR, 1, OPENSSL_LINE, OPENSSL_FUNC, store_ctx->uri);
PROVIDER_CTX_log(store_ctx->prov_ctx, LOG_ERR, 1, OPENSSL_LINE, OPENSSL_FUNC, "%s", store_ctx->uri);
X509_free(cert);
return 0;
}
Expand All @@ -755,7 +758,7 @@ static int store_load(void *ctx, OSSL_CALLBACK *object_cb, void *object_cbarg,

if (!object_cb(params, object_cbarg)) {
/* callback failed */
PROVIDER_CTX_log(store_ctx->prov_ctx, LOG_ERR, 5, OPENSSL_LINE, OPENSSL_FUNC, store_ctx->uri);
PROVIDER_CTX_log(store_ctx->prov_ctx, LOG_ERR, 5, OPENSSL_LINE, OPENSSL_FUNC, "%s", store_ctx->uri);
OPENSSL_free(data);
return 0;
}
Expand Down