evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "platform: msm: resolve NULL pointer dereference issue"

Browse source
This commit is contained in:
Linux Build Service Account 2018-08-20 08:15:53 -07:00 • committed by Gerrit - the friendly Code Review server
commit 7454980b83
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/msm-hyp/msm_drv_hyp.c
View file

@ -318,7 +318,7 @@ static int _msm_parse_dt(struct device_node *node, u32 *client_id)
const char *client_id_str; const char *client_id_str;
client_id_str = of_get_property(node, "qcom,client-id", &len); client_id_str = of_get_property(node, "qcom,client-id", &len);
if (len != CLIENT_ID_LEN_IN_CHARS) { if (!client_id_str || len != CLIENT_ID_LEN_IN_CHARS) {
DBG("client_id_str len(%d) is invalid\n", len); DBG("client_id_str len(%d) is invalid\n", len);
ret = -EINVAL; ret = -EINVAL;
} else { } else {

4
drivers/hwmon/qpnp-adc-common.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2012-2016, 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 * 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 * it under the terms of the GNU General Public License version 2 and
@ -1726,7 +1726,7 @@ int qpnp_adc_get_revid_version(struct device *dev)
} }
revid_data = get_revid_data(revid_dev_node); revid_data = get_revid_data(revid_dev_node);
if (IS_ERR(revid_data)) { if (IS_ERR_OR_NULL(revid_data)) {
pr_debug("revid error rc = %ld\n", PTR_ERR(revid_data)); pr_debug("revid error rc = %ld\n", PTR_ERR(revid_data));
return -EINVAL; return -EINVAL;
} }

2
drivers/net/wireless/cnss/cnss_pci.c
View file

@ -1481,8 +1481,8 @@ static int cnss_smmu_init(struct device *dev)
penv->smmu_iova_start, penv->smmu_iova_start,
penv->smmu_iova_len); penv->smmu_iova_len);
if (IS_ERR(mapping)) { if (IS_ERR(mapping)) {
pr_err("%s: create mapping failed, err = %d\n", __func__, ret);
ret = PTR_ERR(mapping); ret = PTR_ERR(mapping);
pr_err("%s: create mapping failed, err = %d\n", __func__, ret);
goto map_fail; goto map_fail;
} }

2
mm/page_ext.c
View file

@ -187,7 +187,7 @@ struct page_ext *lookup_page_ext(struct page *page)
* This check is also necessary for ensuring page poisoning * This check is also necessary for ensuring page poisoning
* works as expected when enabled * works as expected when enabled
*/ */
if (!section->page_ext) if (!section || !section->page_ext)
return NULL; return NULL;
return section->page_ext + pfn; return section->page_ext + pfn;
} }