From: Aashish Sharma Date: Fri, 11 Feb 2022 12:15:38 +0000 (+0000) Subject: dm crypt: fix get_key_size compiler warning if !CONFIG_KEYS X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=455750e8e91cd367a6087929a62e536e03c27b18;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git dm crypt: fix get_key_size compiler warning if !CONFIG_KEYS [ Upstream commit 6fc51504388c1a1a53db8faafe9fff78fccc7c87 ] Explicitly convert unsigned int in the right of the conditional expression to int to match the left side operand and the return type, fixing the following compiler warning: drivers/md/dm-crypt.c:2593:43: warning: signed and unsigned type in conditional expression [-Wsign-compare] Fixes: c538f6ec9f56 ("dm crypt: add ability to use keys from the kernel key retention service") Signed-off-by: Aashish Sharma Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index b8a9695af141..0b6d4337aaab 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -2114,7 +2114,7 @@ static int crypt_set_keyring_key(struct crypt_config *cc, const char *key_string static int get_key_size(char **key_string) { - return (*key_string[0] == ':') ? -EINVAL : strlen(*key_string) >> 1; + return (*key_string[0] == ':') ? -EINVAL : (int)(strlen(*key_string) >> 1); } #endif