diff mbox series

[v2] ubifs: Fix build errors as symbol undefined

Message ID 20221121111847.71648-1-hucool.lihua@huawei.com
State New
Headers
Series [v2] ubifs: Fix build errors as symbol undefined |

Commit Message

Lihua (lihua, ran) Nov. 21, 2022, 11:18 a.m. UTC 
  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 <hucool.lihua@huawei.com>
---
 fs/ubifs/ubifs.h | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Lihua (lihua, ran) Nov. 23, 2022, 3:29 a.m. UTC | #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 <hucool.lihua@huawei.com>
> ---
>   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);
>
Sascha Hauer Nov. 23, 2022, 7:28 a.m. UTC | #2 
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 <hucool.lihua@huawei.com>

Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>

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
> 
>
Richard Weinberger Nov. 23, 2022, 7:35 a.m. UTC | #3 
----- Ursprüngliche Mail -----
> Von: "Lihua" <hucool.lihua@huawei.com>
> An: "richard" <richard@nod.at>, "Sascha Hauer" <s.hauer@pengutronix.de>
> CC: "linux-mtd" <linux-mtd@lists.infradead.org>, "linux-kernel" <linux-kernel@vger.kernel.org>, "Wei Yongjun"
> <weiyongjun1@huawei.com>, "yusongping" <yusongping@huawei.com>
> 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
diff mbox series

Patch

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);