Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98e7affd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Untrusted pointer dereference"

parents a55e2167 6db3482f

drivers/misc/qseecom.c

+5 −6
Original line number Diff line number Diff line 
/*Qualcomm Secure Execution Environment Communicator (QSEECOM) driver

 *

 * Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -8778,6 +8778,7 @@ exit_unreg_chrdev_region: 
static int qseecom_remove(struct platform_device *pdev)

{

	struct qseecom_registered_kclient_list *kclient = NULL;

	struct qseecom_registered_kclient_list *kclient_tmp = NULL;

	unsigned long flags = 0;

	int ret = 0;

	int i;
@@ -8787,10 +8788,8 @@ static int qseecom_remove(struct platform_device *pdev) 
	atomic_set(&qseecom.qseecom_state, QSEECOM_STATE_NOT_READY);

	spin_lock_irqsave(&qseecom.registered_kclient_list_lock, flags);



	list_for_each_entry(kclient, &qseecom.registered_kclient_list_head,

								list) {

		if (!kclient)

			goto exit_irqrestore;

	list_for_each_entry_safe(kclient, kclient_tmp,

		&qseecom.registered_kclient_list_head, list) {



		/* Break the loop if client handle is NULL */

		if (!kclient->handle)
@@ -8814,7 +8813,7 @@ exit_free_kc_handle: 
	kzfree(kclient->handle);

exit_free_kclient:

	kzfree(kclient);

exit_irqrestore:



	spin_unlock_irqrestore(&qseecom.registered_kclient_list_lock, flags);



	if (qseecom.qseos_version > QSEEE_VERSION_00)