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

Commit 4f26a1f0 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: glink: Add null pointer guards in glink transports"

parents e22ab0e4 48d7592e

drivers/soc/qcom/glink_smd_xprt.c

+6 −0
Original line number Diff line number Diff line
@@ -1754,6 +1754,12 @@ static int tx(struct glink_transport_if *if_ptr, uint32_t lcid, 
		if (!ch->streaming_ch)

			smd_write_end(ch->smd_ch);

		tx_done = kmalloc(sizeof(*tx_done), GFP_ATOMIC);

		if (!tx_done) {

			SMDXPRT_ERR(einfo, "%s: failed allocation of tx_done\n",

					__func__);

			srcu_read_unlock(&einfo->ssr_sync, rcu_id);

			return -ENOMEM;

		}

		tx_done->ch = ch;

		tx_done->iid = pctx->riid;

		INIT_WORK(&tx_done->work, process_tx_done);

drivers/soc/qcom/glink_smem_native_xprt.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 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
@@ -2682,7 +2682,7 @@ static int glink_mailbox_probe(struct platform_device *pdev) 


	key = "irq-rx-reset";

	rx_reset_r = platform_get_resource_byname(pdev, IORESOURCE_MEM, key);

	if (!irq_r) {

	if (!rx_reset_r) {

		pr_err("%s: missing key %s\n", __func__, key);

		rc = -ENODEV;

		goto missing_key;