Skip to contentSkip to conversation

xfrm/compat: Remove use of kmalloc_track_caller

PATCH In review Alistair Delva 3 participants 4 messages Nov 1, 2020 – Nov 2, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfrm/compat: Remove use of kmalloc_track_caller

The __kmalloc_track_caller symbol is not exported if SLUB/SLOB are enabled instead of SLAB, which breaks the build on such configs when CONFIG_XFRM_USER_COMPAT=m.

ERROR: "__kmalloc_track_caller" [net/xfrm/xfrm_compat.ko] undefined!

Other users of this symbol are 'bool' options, but changing this to bool would require XFRM_USER to be built in as well, which doesn't seem worth it. Go back to kmalloc().

Fixes 96392ee5a13b9 ("xfrm/compat: Translate 32-bit user_policy from sockptr")
Cc Dmitry Safonov <[email protected]>
Cc Maciej Żenczykowski <[email protected]>
Cc Steffen Klassert <[email protected]>
---
 net/xfrm/xfrm_compat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/xfrm/xfrm_compat.c +1 -1
index e28f0c9ecd6a..c1dee0696dfb 100644
@@ -585,7 +585,7 @@ static int xfrm_user_policy_compat(u8 **pdata32, int optlen)
 	if (optlen < sizeof(*p))
 		return -EINVAL;
 
-	data64 = kmalloc_track_caller(optlen + 4, GFP_USER | __GFP_NOWARN);
+	data64 = kmalloc(optlen + 4, GFP_USER | __GFP_NOWARN);
 	if (!data64)
 		return -ENOMEM;
 
Signature · 1 line
2.29.1.341.ge80a0c044ae-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Alistair Delva

The __kmalloc_track_caller symbol is not exported if SLUB/SLOB are enabled instead of SLAB, which breaks the build on such configs when CONFIG_XFRM_USER_COMPAT=m.

ERROR: "__kmalloc_track_caller" [net/xfrm/xfrm_compat.ko] undefined!

Other users of this symbol are 'bool' options, but changing this to bool would require XFRM_USER to be built in as well, which doesn't seem worth it. Go back to kmalloc().

Quoted 5 lines
Fixes 96392ee5a13b9 ("xfrm/compat: Translate 32-bit user_policy from sockptr")
Cc Dmitry Safonov <[email protected]>
Cc Maciej Żenczykowski <[email protected]>
Cc Steffen Klassert <[email protected]>

Thank you!

--
Dmitry

maintainer
#2 lore raw
In reply to Alistair Delva
Quoted 5 lines · Alistair Delva

The __kmalloc_track_caller symbol is not exported if SLUB/SLOB are enabled instead of SLAB, which breaks the build on such configs when CONFIG_XFRM_USER_COMPAT=m.

ERROR: "__kmalloc_track_caller" [net/xfrm/xfrm_compat.ko] undefined!

Is this with a recent kernel? Because they should be exported:

commit fd7cb5753ef49964ea9db5121c3fc9a4ec21ed8e

Author: Daniel Vetter <[email protected]>
Date:   Mon Mar 23 15:49:00 2020 +0100

mm/sl[uo]b: export __kmalloc_track(_node)_caller

Cheers,

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
#3 lore raw
Quoted 7 lines · Herbert Xu
Quoted 6 lines · Alistair Delva

The __kmalloc_track_caller symbol is not exported if SLUB/SLOB are enabled instead of SLAB, which breaks the build on such configs when CONFIG_XFRM_USER_COMPAT=m.

ERROR: "__kmalloc_track_caller" [net/xfrm/xfrm_compat.ko] undefined!

Quoted 7 lines

Is this with a recent kernel? Because they should be exported:

commit fd7cb5753ef49964ea9db5121c3fc9a4ec21ed8e

Author: Daniel Vetter <[email protected]>
Date:   Mon Mar 23 15:49:00 2020 +0100

mm/sl[uo]b: export __kmalloc_track(_node)_caller

Whoops, you're right - I confused two allmodconfig issues when backporting. Sorry for the noise.

Quoted 9 lines

Cheers,
--
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].