Date:   Wed, 24 Nov 2021 17:54:04 +0300
From:   Dan Carpenter <dan.carpenter@oracle.com>
To:     Jens Wiklander <jens.wiklander@linaro.org>,
        Rijo Thomas <Rijo-john.Thomas@amd.com>
Cc:     Sumit Garg <sumit.garg@linaro.org>,
        Devaraj Rangasamy <Devaraj.Rangasamy@amd.com>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        Gary R Hook <gary.hook@amd.com>,
        op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org,
        kernel-janitors@vger.kernel.org
Subject: [PATCH] tee: amdtee: fix an IS_ERR() vs NULL bug
Message-ID: <20211124145404.GE13656@kili>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.10.1 (2018-07-13)
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NIdBl2LRsN72neC+5Erly5lpCnFk3pUbnA2IekQM/LmAzjkRhF+s0NRFlLVQ?=
 =?us-ascii?Q?xDE60C9jrR4rlP4mtC5Wjt/o2LIY0gxyzEsmijXKZyBukxOw6NeoK18pDDKW?=
 =?us-ascii?Q?qwblEAXX9p7CpQsuQXw9/zXDwc6QQwPRsi9zxabdjvXGKdl/1ehlk1oBOt53?=
 =?us-ascii?Q?NbpI6rWzgKzD+ohVDOCtk3iRzSd7ntfFqOFderKrX7O1nzJCI19L+mEkhD2M?=
 =?us-ascii?Q?iaLbNK+hJ996+03LGR9sb24YfEUWklfQkNbq3idAIW1391M2Mw5ToMMCMsjx?=
 =?us-ascii?Q?I57m2Zv4cMsm5QjBVms1Uo6NUaI4vx9SHeFNfrYvdNrinmIDblmGZ+H242Kd?=
 =?us-ascii?Q?29M5ZhH1l58VuQKz4+Z9fq7YR33LuMdBfx1cfGU60rxOqcg049+ta02HGciQ?=
 =?us-ascii?Q?eR0t+US0FWlN5YCVHZJ9SuIV5DH/lB49Vt+K38ZGRsJDqP4Oo4hnE3NENMzp?=
 =?us-ascii?Q?RMaSJX1bdES30Fun/7Pq7nCorTQ3CT30WPROyYwcwxCPPXZWUK0JsCPrmblf?=
 =?us-ascii?Q?hm4e0LJHu7eJZgbOYCLAJ71uEFCf/IfFtQnSdHcG16k5BDby/ZbTpwUni6ak?=
 =?us-ascii?Q?SIsDPGG71DduTvI4dQqtfCq2op2cqUIfqVK9Ymszt6a9bG7LRgdNxUOAMYJU?=
 =?us-ascii?Q?ZSWLBULyzI8pQWPeK0KqgmO7x8/k+7hBXGtS8WMrfH/nEIMXUSANF/zDiUOC?=
 =?us-ascii?Q?66iZoDqVtueKCKVYuy79Dz5B4UUg3MAOeIF2BuJr8vJOzJxwMfyDdDyMd12/?=
 =?us-ascii?Q?n7LvzCFQDttiLihegOAkq52p76D1TT8pYVTPfm3Ro9BDXAlt8GYku0Z7sw0F?=
 =?us-ascii?Q?sqWaDNKtX4gKK6HQLcWiBJUfx+5aAOu+73rCL4HTs6wH3EKKXgAxqA4XqStm?=
 =?us-ascii?Q?qwYAxj1AcvFUFAg7g+24Yc3a1DAjK4Ce7JTBMLanjfGAGZqO8Imzz8JcAy2a?=
 =?us-ascii?Q?2f76qSTO2vtH0u9Egkg8ytbhd3juDhooqueQHt+0E/s+IIeRbshpSbP8JBWY?=
 =?us-ascii?Q?iI3NS6s0b5Wa+47pl+xd8YGNpCBprvETeTib1JG9soKZiO3XgmVOVhWsijVO?=
 =?us-ascii?Q?hyfCwF67QyN8bqm3zvnh1hErqeUiYyMq3OwBP6ih9go01ANVX1ACtHCykMPi?=
 =?us-ascii?Q?e/O9Ct2Vw2aCY2AuPx9PcD7l/gm4MGgtBsYQoQ6wHE2V83H23Sb/ZdP5KUyD?=
 =?us-ascii?Q?FiMjVy2rVwstHTR8AX8cSmcVK9gpaVHjlSGzO3Hh0vyW4LYYPa8ETvUv3cQ7?=
 =?us-ascii?Q?vJ4K6PiCj+dlsUbctjO9nLo2zQXkFA35Rq4/1AN/IGkXJni4EM6LhfSE94k7?=
 =?us-ascii?Q?2oSsxy+4UAUiAGGyteV2DZxv8rMMX/P0rhtdLB0zI+4D/sy+hHutG7sEoWvt?=
 =?us-ascii?Q?KrjtCaKiUKSb8n1iXJaffm3i7Wkb1P/kunNvW1lvDJ6olpcCbeK5jPmlSqrt?=
 =?us-ascii?Q?ig7JercA7DFi+GxVMPqV8hMb8JmLvJpI7FIKREpfHGeACEbjlrPwlhQV0gD7?=
 =?us-ascii?Q?tsgaCjSdWRN7HW8qivAdoCTzMKjMJWFUXXYRCgk0nf/XbUG9IVYXGksxr4pf?=
 =?us-ascii?Q?/I0bQFA/zwkjPp1/R0XM29KD8ysBQmx3Q8cz39zz8bcGzRoiPuWE4LGJtyw4?=
 =?us-ascii?Q?/dZ3ZxD0MahtcpdMvF2yw8+6Sf6ZU2fffB9J1vQhv8Jfx6K/txLDDdDe+xCN?=
 =?us-ascii?Q?rdafH+EMIQPBcwS4qnf73jy0lTM=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 30c8b09c-b43d-4793-abbe-08d9af5a4926
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2365.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2021 14:54:16.1752
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: jpfvjf2Oe5xFvyvhpLi2qpsyqTaAuOvQksBF2TjQl4xOcqEVtK0QBIxKXFctg8Yj3aSde8LPjuH7Bn3qRJ2cPwmr62kKjFPJ0asXcLcsbyI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4707
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10178 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 spamscore=0
 mlxlogscore=999 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2111240083
X-Proofpoint-GUID: uXlz_-P4v2vZIAEtbnKSuDrnAlOWfWQ7
X-Proofpoint-ORIG-GUID: uXlz_-P4v2vZIAEtbnKSuDrnAlOWfWQ7
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The __get_free_pages() function does not return error pointers it returns
NULL so fix this condition to avoid a NULL dereference.

Fixes: 757cc3e9ff1d ("tee: add AMD-TEE driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/tee/amdtee/core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/tee/amdtee/core.c b/drivers/tee/amdtee/core.c
index da6b88e80dc0..297dc62bca29 100644
--- a/drivers/tee/amdtee/core.c
+++ b/drivers/tee/amdtee/core.c
@@ -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;
 	}
-- 
2.20.1