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

Commit 59a21d94 authored by Bharath's avatar Bharath
Browse files

Merge tag 'LA.UM.10.6.2.r1-02300-89xx.0' into staging/12/fp3 

"LA.UM.10.6.2.r1-02300-89xx.0"

* tag 'LA.UM.10.6.2.r1-02300-89xx.0':
  mcinvoke : Make sure tzhandle is set before f frees
  msm: kgsl: Remove 'fd' dependency to get dma_buf handle
  msm: kgsl: Fix gpuaddr_in_range() to check upper bound

Change-Id: I44fc9ebcc565c2d8934de3c0b36ef30c5705593b
parents 03196aba d8327478

drivers/soc/qcom/smcinvoke.c

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * SMC Invoke driver

 *

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

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. 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
@@ -173,9 +174,9 @@ static int get_fd_from_tzhandle(uint32_t tzhandle, int64_t *fd) 
		goto out;



	*fd = unused_fd;

	fd_install(*fd, f);

	((struct smcinvoke_tzobj_context *)

			(f->private_data))->tzhandle = tzhandle;

	fd_install(*fd, f);

	return 0;

out:

	if (unused_fd >= 0)