eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add (ugly) wrorkaround for musl broken macro

Browse Source 
Nobody fixes this for years, there are multiple discussions.
Let's just ignore it.
This commit is contained in:
Milan Broz
2025-07-31 01:15:40 +00:00
parent b7e3ea592b
commit b0d38f932f
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/crypto_backend/crypto_cipher_kernel.c
View File

@@ -99,6 +99,20 @@ int crypt_cipher_init_kernel(struct crypt_cipher_kernel *ctx, const char *name,
return _crypt_cipher_init(ctx, key, key_length, 0, &sa); return _crypt_cipher_init(ctx, key, key_length, 0, &sa);
} }
/* musl has broken CMSG_NXTHDR macro in system headers */
static inline struct cmsghdr *_CMSG_NXTHDR(struct msghdr* mhdr, struct cmsghdr* cmsg)
{
#if !defined(__GLIBC__) && defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcast-align"
#pragma clang diagnostic ignored "-Wsign-compare"
return CMSG_NXTHDR(mhdr, cmsg);
#pragma clang diagnostic pop
#else
return CMSG_NXTHDR(mhdr, cmsg);
#endif
}
/* The in/out should be aligned to page boundary */ /* The in/out should be aligned to page boundary */
/* coverity[ -taint_source : arg-3 ] */ /* coverity[ -taint_source : arg-3 ] */
static int _crypt_cipher_crypt(struct crypt_cipher_kernel *ctx, static int _crypt_cipher_crypt(struct crypt_cipher_kernel *ctx,
@@ -146,7 +160,7 @@ static int _crypt_cipher_crypt(struct crypt_cipher_kernel *ctx,
/* Set IV */ /* Set IV */
if (iv) { if (iv) {
header = CMSG_NXTHDR(&msg, header); header = _CMSG_NXTHDR(&msg, header);
if (!header) if (!header)
return -EINVAL; return -EINVAL;