With CONFIG_UBIFS_FS_AUTHENTICATION not set, the compiler can assume that
ubifs_node_check_hash() is never true and drops the call to ubifs_bad_hash().
Is CONFIG_CC_OPTIMIZE_FOR_SIZE enabled this optimization does not happen anymore.
So When CONFIG_UBIFS_FS and CONFIG_CC_OPTIMIZE_FOR_SIZE is enabled but
CONFIG_UBIFS_FS_AUTHENTICATION is not set, the build errors is as followd:
ERROR: modpost: "ubifs_bad_hash" [fs/ubifs/ubifs.ko] undefined!
Fix it by add no-op ubifs_bad_hash() for the CONFIG_UBIFS_FS_AUTHENTICATION=n case.
Fixes: 16a26b20d2af ("ubifs: authentication: Add hashes to index nodes")
Signed-off-by: Li Hua <[email protected]>
---
fs/ubifs/ubifs.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 478bbbb5382f..2f1f31581094 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -1623,8 +1623,13 @@ static inline int ubifs_check_hmac(const struct ubifs_info *c,
return crypto_memneq(expected, got, c->hmac_desc_len);
}
+#ifdef CONFIG_UBIFS_FS_AUTHENTICATION
void ubifs_bad_hash(const struct ubifs_info *c, const void *node,
const u8 *hash, int lnum, int offs);
+#else
+static inline void ubifs_bad_hash(const struct ubifs_info *c, const void *node,
+ const u8 *hash, int lnum, int offs) {};
+#endif
int __ubifs_node_check_hash(const struct ubifs_info *c, const void *buf,
const u8 *expected);
--
2.17.1
ping
在 2022/11/21 19:18, Li Hua 写道:
> With CONFIG_UBIFS_FS_AUTHENTICATION not set, the compiler can assume that
> ubifs_node_check_hash() is never true and drops the call to ubifs_bad_hash().
> Is CONFIG_CC_OPTIMIZE_FOR_SIZE enabled this optimization does not happen anymore.
>
> So When CONFIG_UBIFS_FS and CONFIG_CC_OPTIMIZE_FOR_SIZE is enabled but
> CONFIG_UBIFS_FS_AUTHENTICATION is not set, the build errors is as followd:
> ERROR: modpost: "ubifs_bad_hash" [fs/ubifs/ubifs.ko] undefined!
>
> Fix it by add no-op ubifs_bad_hash() for the CONFIG_UBIFS_FS_AUTHENTICATION=n case.
>
> Fixes: 16a26b20d2af ("ubifs: authentication: Add hashes to index nodes")
> Signed-off-by: Li Hua <[email protected]>
> ---
> fs/ubifs/ubifs.h | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
> index 478bbbb5382f..2f1f31581094 100644
> --- a/fs/ubifs/ubifs.h
> +++ b/fs/ubifs/ubifs.h
> @@ -1623,8 +1623,13 @@ static inline int ubifs_check_hmac(const struct ubifs_info *c,
> return crypto_memneq(expected, got, c->hmac_desc_len);
> }
>
> +#ifdef CONFIG_UBIFS_FS_AUTHENTICATION
> void ubifs_bad_hash(const struct ubifs_info *c, const void *node,
> const u8 *hash, int lnum, int offs);
> +#else
> +static inline void ubifs_bad_hash(const struct ubifs_info *c, const void *node,
> + const u8 *hash, int lnum, int offs) {};
> +#endif
>
> int __ubifs_node_check_hash(const struct ubifs_info *c, const void *buf,
> const u8 *expected);
>
On Mon, Nov 21, 2022 at 07:18:47PM +0800, Li Hua wrote:
> With CONFIG_UBIFS_FS_AUTHENTICATION not set, the compiler can assume that
> ubifs_node_check_hash() is never true and drops the call to ubifs_bad_hash().
> Is CONFIG_CC_OPTIMIZE_FOR_SIZE enabled this optimization does not happen anymore.
>
> So When CONFIG_UBIFS_FS and CONFIG_CC_OPTIMIZE_FOR_SIZE is enabled but
> CONFIG_UBIFS_FS_AUTHENTICATION is not set, the build errors is as followd:
> ERROR: modpost: "ubifs_bad_hash" [fs/ubifs/ubifs.ko] undefined!
>
> Fix it by add no-op ubifs_bad_hash() for the CONFIG_UBIFS_FS_AUTHENTICATION=n case.
>
> Fixes: 16a26b20d2af ("ubifs: authentication: Add hashes to index nodes")
> Signed-off-by: Li Hua <[email protected]>
Reviewed-by: Sascha Hauer <[email protected]>
Sascha
> ---
> fs/ubifs/ubifs.h | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
> index 478bbbb5382f..2f1f31581094 100644
> --- a/fs/ubifs/ubifs.h
> +++ b/fs/ubifs/ubifs.h
> @@ -1623,8 +1623,13 @@ static inline int ubifs_check_hmac(const struct ubifs_info *c,
> return crypto_memneq(expected, got, c->hmac_desc_len);
> }
>
> +#ifdef CONFIG_UBIFS_FS_AUTHENTICATION
> void ubifs_bad_hash(const struct ubifs_info *c, const void *node,
> const u8 *hash, int lnum, int offs);
> +#else
> +static inline void ubifs_bad_hash(const struct ubifs_info *c, const void *node,
> + const u8 *hash, int lnum, int offs) {};
> +#endif
>
> int __ubifs_node_check_hash(const struct ubifs_info *c, const void *buf,
> const u8 *expected);
> --
> 2.17.1
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
----- Ursprüngliche Mail -----
> Von: "Lihua" <[email protected]>
> An: "richard" <[email protected]>, "Sascha Hauer" <[email protected]>
> CC: "linux-mtd" <[email protected]>, "linux-kernel" <[email protected]>, "Wei Yongjun"
> <[email protected]>, "yusongping" <[email protected]>
> Gesendet: Mittwoch, 23. November 2022 04:29:04
> Betreff: Re: [PATCH v2] ubifs: Fix build errors as symbol undefined
> ping
While I'm perfectly fine with pinging, because I'm more busy than I want to,
pinging after less than 48 hours is a little aggressive.
Thanks,
//richard