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

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

Merge "soc: qcom: smp2p: Fix kernel address leak"

parents 19ea9b17 2c6444e6

drivers/gpio/gpio-msm-smp2p.c

+2 −2
Original line number Diff line number Diff line 
/* drivers/gpio/gpio-msm-smp2p.c

 *

 * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2014, 2016 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
@@ -368,7 +368,7 @@ static int smp2p_irq_map(struct irq_domain *domain_ptr, unsigned int virq, 


	chip = domain_ptr->host_data;

	if (!chip) {

		SMP2P_ERR("%s: invalid domain ptr %p\n", __func__, domain_ptr);

		SMP2P_ERR("%s: invalid domain ptr\n", __func__);

		return -ENODEV;

	}

drivers/soc/qcom/smp2p.c

+3 −3
Original line number Diff line number Diff line 
/* drivers/soc/qcom/smp2p.c

 *

 * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2016, 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
@@ -519,8 +519,8 @@ static void smp2p_find_entry_v1(struct smp2p_smem __iomem *item, 
	char entry_name[SMP2P_MAX_ENTRY_NAME];



	if (!item || !name || !entry_ptr) {

		SMP2P_ERR("%s: invalid arguments %p, %p, %p\n",

				__func__, item, name, entry_ptr);

		SMP2P_ERR("%s: invalid arguments %d %d %d\n",

				__func__, !item, !name, !entry_ptr);

		return;

	}

drivers/soc/qcom/smp2p_debug.c

+2 −2
Original line number Diff line number Diff line 
/* drivers/soc/qcom/smp2p_debug.c

 *

 * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2014,2016 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
@@ -41,7 +41,7 @@ static void smp2p_int_stats(struct seq_file *s) 
				pid != SMP2P_REMOTE_MOCK_PROC)

			continue;



		seq_printf(s, "| %5s (%d) | %11u | %10u | %10u | %p | %08x |\n",

		seq_printf(s, "| %5s (%d) | %11u | %10u | %10u | %pK | %08x |\n",

			int_cfg[pid].name,

			pid, int_cfg[pid].in_int_id,

			int_cfg[pid].in_interrupt_count,

drivers/soc/qcom/smp2p_test_common.h

+3 −2
Original line number Diff line number Diff line 
/* drivers/soc/qcom/smp2p_test_common.h

 *

 * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2014,2016 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
@@ -49,7 +49,8 @@ 
	void *a_tmp = (a); \

	void *b_tmp = (b); \

	if (!((a_tmp)cmp(b_tmp))) { \

		seq_printf(s, "%s:%d Fail: " #a "(%p) " #cmp " " #b "(%p)\n", \

		seq_printf(s, "%s:%d Fail: " #a "(%pK) " #cmp \

				" " #b "(%pK)\n", \

				__func__, __LINE__, \

				a_tmp, b_tmp); \

		failed = 1; \