lib/accelerated: use unlikely on buffer length checks more consistently

Signed-off-by: Alexander Sosedkin <asosedkin@redhat.com>

diff --git a/lib/accelerated/afalg.c b/lib/accelerated/afalg.c
index 03a8e957b5d334fdd02d8104f6fac3c5b0f74794..024925143201cbca59062dfac1ce9362531cdd93 100644 (file)
--- a/lib/accelerated/afalg.c
+++ b/lib/accelerated/afalg.c
@@ -421,7 +421,7 @@ static int afalg_aead_encrypt(void *_ctx, const void *nonce, size_t nonce_size,
                return GNUTLS_E_MEMORY_ERROR;
        }
 
-       if (encr_size - tag_size < plain_size) {
+       if (unlikely(encr_size - tag_size < plain_size)) {
                ret = GNUTLS_E_SHORT_MEMORY_BUFFER;
                gnutls_assert();
                goto end;

diff --git a/lib/accelerated/cryptodev-gcm.c b/lib/accelerated/cryptodev-gcm.c
index d75ea45b9051bcbf8033a6f183d41c114423bef3..f729406b8ea14db72f6a0cda0a135b40d02743ab 100644 (file)
--- a/lib/accelerated/cryptodev-gcm.c
+++ b/lib/accelerated/cryptodev-gcm.c
@@ -137,7 +137,7 @@ aes_gcm_encrypt(void *_ctx, const void *src, size_t src_size,
        /* the GCM in kernel will place the tag after the
         * encrypted data.
         */
-       if (dst_size - GCM_BLOCK_SIZE < src_size)
+       if (unlikely(dst_size - GCM_BLOCK_SIZE < src_size))
                return gnutls_assert_val(GNUTLS_E_SHORT_MEMORY_BUFFER);
 
        ctx->cryp.len = src_size;
@@ -176,7 +176,7 @@ aes_gcm_decrypt(void *_ctx, const void *src, size_t src_size,
        ctx->cryp.auth_len = ctx->auth_data_size;
        ctx->cryp.auth_src = ctx->auth_data;
 
-       if (dst_size < src_size - GCM_BLOCK_SIZE)
+       if (unlikely(dst_size < src_size - GCM_BLOCK_SIZE))
                return gnutls_assert_val(GNUTLS_E_SHORT_MEMORY_BUFFER);
 
        if (ioctl(ctx->cfd, CIOCAUTHCRYPT, &ctx->cryp)) {