AMD-TEE fix IS_ERR() bug

-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEEFV+gSSXZJY9ZyuB5LinzTIcAHJcFAmGlyQkaHGplbnMud2lr
 bGFuZGVyQGxpbmFyby5vcmcACgkQLinzTIcAHJewwA//e6HhZCm7Sn37pxBcG3xY
 HQd0Q5u7UhD/CLTuWelMdSVDl+HhOcya5rM+DrobzGNUfmdT4+mEjmEHZ9u0Xxiv
 Z0oEvZ0c4SMsXFsgpibeZu5LIxPE/jIKVGugiJ4cTWHCaGElTK9ygA49xydk+Y4X
 81+r922jca8++iwBVFLuaecVs6UFHWwAH0zNNVR6XNyHPWhGI+UVHC5wo0+LdhVB
 Kq8YC7+lxOAnNGBeAo3rVW2HF5sIPAqKpuN6rQhbpdzkNUy9ua7oy3/iJnN/iMIE
 idrIh+MiXd6MTJqU11BQKqp9fCksLv4dWwMbrN1e69m8kMFlKjEX1GJsF/1FmdJL
 zCEBI1MpKwCVD3CwRDPHvOKdbu0vVWRFX/gtWZ+yokpNtzGCFhr5sKcibYh7lQRe
 5N0PyF507P02L0b1ctTa3XEpwwup+ZBulMzFBBh1T4kjsW8cXOBpUcrCZK1VXgiX
 IcBgdQz55A0dRGxVceJD8/KxOjTN/7keCZr0591ZJTuWioR9O3MHuTlSz8FE7dfP
 8516QNCoqHKhFs/4bOQWVcsD5pF3wYFfdLBPzQGpJvNEH6Vi72CR5PCkJYJo0NWU
 rkQTN8SeGMYxFwJG/s8P4Cnykllm6dP3Z2kXAomGtAqVfRtcGZZzTo1g4FOQKw84
 X4CkQKcxSMSbMKsNKfd1SY8=
 =dYAo
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmG3UgcACgkQmmx57+YA
 GNme5g/+L5RnU5hsb366LfGkkuLoNmF47Jqf94rU0MGBdd52RCRggbAF4T2JemtU
 xgDYBzucoDPE799mGCemypiF+0xf5buNF2IKvTYtCDrjj67Ym9RaJ9M/bP49ZyIj
 V3ylh6eiu3gefE2HWk7+7xtEIReb2cEe3Jp9B2NEdVnBltVQtSzRvBLdFyFmawDT
 Cu+jo7/YbYRMx/9wEFLDE+ssBMIQr5t8HXfSOCgRjMHvsqISnYcG0KhaMEr+I7AI
 vNiTfr0id7MyIRx4QXirrMm/IUIO0B0qywFCa7e/jzjB/MEmrlYtjDf9qQLNlqP9
 8B++IOQQ6Iv7zAkcVkuefMT3IiPCQmD/oMoH83DKIV199OGSiBZTBnEsMykj1Rou
 ItypOntXnynXIGfZs0WN88axTktVjLwyCpmxxMUlBptf42P/AMBfXdMb+9kr3nbm
 F43M2nHJuU88XH1wg/MGsE3EFzjMO7QO5fFj0a6x/3H2qGrmDAM7SYjAWHe+XN8U
 QDkFZSLM6g8zI5vlzqNdO2+dAJljPEm1SruUW693JM66M+U9V805wTXVhLzgxaPw
 v9m2uTqQZgO75P01j74gKXsUnHCyDtPTN6blyKBwxGo50GEMHuQ7C69i4Hv/Mdn1
 v9cxvUKk5Xv79AfFWiRT3gg4riEwBgB1hBJ9lczIzGue2EmlbmE=
 =gH+8
 -----END PGP SIGNATURE-----

Merge tag 'amdtee-fix-for-v5.16' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes

AMD-TEE fix IS_ERR() bug

* tag 'amdtee-fix-for-v5.16' of git://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: amdtee: fix an IS_ERR() vs NULL bug

Link: https://lore.kernel.org/r/20211130070351.GA2308099@jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-12-13 15:00:38 +01:00
commit df0a9b525c
1 changed files with 2 additions and 3 deletions

View File

@ -203,9 +203,8 @@ static int copy_ta_binary(struct tee_context *ctx, void *ptr, void **ta,
*ta_size = roundup(fw->size, PAGE_SIZE);
*ta = (void *)__get_free_pages(GFP_KERNEL, get_order(*ta_size));
if (IS_ERR(*ta)) {
pr_err("%s: get_free_pages failed 0x%llx\n", __func__,
(u64)*ta);
if (!*ta) {
pr_err("%s: get_free_pages failed\n", __func__);
rc = -ENOMEM;
goto rel_fw;
}