History

qcom: soc: llcc-slice: Clear the global drv_data pointer on error

Currently the data structure for llc-slice is devm allocated and stored as a global but never cleared if the probe function fails. This is a problem because devm managed memory gets freed on probe failure the API functions could access the pointer after it has been freed. Initialize the drv_data pointer to an error and reset it to an error on probe failure or device destroy and add protection to the API functions to make sure the memory doesn't get accessed.

Jordan Crouse committed 7 years ago

Commit 72d1cd01 parent 4e2256d3 files · +66 −17Browse files

Unified · Split

3 files
  1. drivers/soc/qcom/llcc-sdm845.c +6 −0
  2. drivers/soc/qcom/llcc-slice.c +54 −17
  3. include/linux/soc/qcom/llcc-qcom.h +6 −0
drivers/soc/qcom/llcc-sdm845.c+6−0
@@ -71,6 +71,11 @@ static struct llcc_slice_config sdm845_data[] = { · 70 unmodified lines
7171 SCT_ENTRY(LLCC_AUDHW, 22, 1024, 1, 1, 0xffc, 0x2, 0, 0, 1, 1, 0),
7272 };
7373
74+static int sdm845_qcom_llcc_remove(struct platform_device *pdev)
75+{
76+ return qcom_llcc_remove(pdev);
77+}
78+
7479 static int sdm845_qcom_llcc_probe(struct platform_device *pdev)
7580 {
7681 return qcom_llcc_probe(pdev, sdm845_data, ARRAY_SIZE(sdm845_data));
@@ -87,6 +92,7 @@ static struct platform_driver sdm845_qcom_llcc_driver = { · 10 unmodified lines
8792 .of_match_table = sdm845_qcom_llcc_of_match,
8893 },
8994 .probe = sdm845_qcom_llcc_probe,
95+ .remove = sdm845_qcom_llcc_remove,
9096 };
9197 module_platform_driver(sdm845_qcom_llcc_driver);
9298
drivers/soc/qcom/llcc-slice.c+54−17
@@ -46,7 +46,7 @@ · 45 unmodified lines
4646
4747 #define BANK_OFFSET_STRIDE 0x80000
4848
49−static struct llcc_drv_data *drv_data;
49+static struct llcc_drv_data *drv_data = (void *) -EPROBE_DEFER;
5050
5151 static const struct regmap_config llcc_regmap_config = {
5252 .reg_bits = 32,
@@ -68,6 +68,9 @@ struct llcc_slice_desc *llcc_slice_getd(u32 uid) · 15 unmodified lines
6868 struct llcc_slice_desc *desc;
6969 u32 sz, count;
7070
71+ if (IS_ERR(drv_data))
72+ return ERR_CAST(drv_data);
73+
7174 cfg = drv_data->cfg;
7275 sz = drv_data->cfg_size;
7376
@@ -108,6 +111,9 @@ static int llcc_update_act_ctrl(u32 sid, · 34 unmodified lines
108111 u32 slice_status;
109112 int ret;
110113
114+ if (IS_ERR(drv_data))
115+ return PTR_ERR(drv_data);
116+
111117 act_ctrl_reg = LLCC_TRP_ACT_CTRLn(sid);
112118 status_reg = LLCC_TRP_STATUSn(sid);
113119
@@ -143,6 +149,9 @@ int llcc_slice_activate(struct llcc_slice_desc *desc) · 29 unmodified lines
143149 int ret;
144150 u32 act_ctrl_val;
145151
152+ If (IS_ERR(drv_data))
153+ return PTR_ERR(drv_data);
154+
146155 if (IS_ERR_OR_NULL(desc))
147156 return -EINVAL;
148157
@@ -180,6 +189,9 @@ int llcc_slice_deactivate(struct llcc_slice_desc *desc) · 31 unmodified lines
180189 u32 act_ctrl_val;
181190 int ret;
182191
192+ If (IS_ERR(drv_data))
193+ return PTR_ERR(drv_data);
194+
183195 if (IS_ERR_OR_NULL(desc))
184196 return -EINVAL;
185197
@@ -289,6 +301,14 @@ static int qcom_llcc_cfg_program(struct platform_device *pdev) · 103 unmodified lines
289301 return ret;
290302 }
291303
304+int qcom_llcc_remove(struct platform_device *pdev)
305+{
306+ /* Set the global pointer to a error code to avoid referencing it */
307+ drv_data = ERR_PTR(-ENODEV);
308+ return 0;
309+}
310+EXPORT_SYMBOL_GPL(qcom_llcc_remove);
311+
292312 int qcom_llcc_probe(struct platform_device *pdev,
293313 const struct llcc_slice_config *llcc_cfg, u32 sz)
294314 {
@@ -300,35 +320,45 @@ int qcom_llcc_probe(struct platform_device *pdev, · 5 unmodified lines
300320 struct platform_device *llcc_edac;
301321
302322 drv_data = devm_kzalloc(dev, sizeof(*drv_data), GFP_KERNEL);
303− if (!drv_data)
304− return -ENOMEM;
323+ if (!drv_data) {
324+ ret = -ENOMEM;
325+ goto err;
326+ }
305327
306328 llcc_banks_res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
307329 "llcc_base");
308330 llcc_banks_base = devm_ioremap_resource(&pdev->dev, llcc_banks_res);
309− if (IS_ERR(llcc_banks_base))
310− return PTR_ERR(llcc_banks_base);
331+ if (IS_ERR(llcc_banks_base)) {
332+ ret = PTR_ERR(llcc_banks_base);
333+ goto err;
334+ }
311335
312336 drv_data->regmap = devm_regmap_init_mmio(dev, llcc_banks_base,
313337 &llcc_regmap_config);
314− if (IS_ERR(drv_data->regmap))
315− return PTR_ERR(drv_data->regmap);
338+ if (IS_ERR(drv_data->regmap)) {
339+ ret = PTR_ERR(drv_data->regmap);
340+ goto err;
341+ }
316342
317343 llcc_bcast_res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
318344 "llcc_broadcast_base");
319345 llcc_bcast_base = devm_ioremap_resource(&pdev->dev, llcc_bcast_res);
320− if (IS_ERR(llcc_bcast_base))
321− return PTR_ERR(llcc_bcast_base);
346+ if (IS_ERR(llcc_bcast_base)) {
347+ ret = PTR_ERR(llcc_bcast_base);
348+ goto err;
349+ }
322350
323351 drv_data->bcast_regmap = devm_regmap_init_mmio(dev, llcc_bcast_base,
324352 &llcc_regmap_config);
325− if (IS_ERR(drv_data->bcast_regmap))
326− return PTR_ERR(drv_data->bcast_regmap);
353+ if (IS_ERR(drv_data->bcast_regmap)) {
354+ ret = PTR_ERR(drv_data->bcast_regmap);
355+ goto err;
356+ }
327357
328358 ret = regmap_read(drv_data->regmap, LLCC_COMMON_STATUS0,
329359 &num_banks);
330360 if (ret)
331− return ret;
361+ goto err;
332362
333363 num_banks &= LLCC_LB_CNT_MASK;
334364 num_banks >>= LLCC_LB_CNT_SHIFT;
@@ -340,8 +370,10 @@ int qcom_llcc_probe(struct platform_device *pdev, · 5 unmodified lines
340370
341371 drv_data->offsets = devm_kcalloc(dev, num_banks, sizeof(u32),
342372 GFP_KERNEL);
343− if (!drv_data->offsets)
344− return -ENOMEM;
373+ if (!drv_data->offsets) {
374+ ret = -ENOMEM;
375+ goto err;
376+ }
345377
346378 for (i = 0; i < num_banks; i++)
347379 drv_data->offsets[i] = i * BANK_OFFSET_STRIDE;
@@ -349,8 +381,10 @@ int qcom_llcc_probe(struct platform_device *pdev, · 1 unmodified line
349381 drv_data->bitmap = devm_kcalloc(dev,
350382 BITS_TO_LONGS(drv_data->max_slices), sizeof(unsigned long),
351383 GFP_KERNEL);
352− if (!drv_data->bitmap)
353− return -ENOMEM;
384+ if (!drv_data->bitmap) {
385+ ret = -ENOMEM;
386+ goto err;
387+ }
354388
355389 drv_data->cfg = llcc_cfg;
356390 drv_data->cfg_size = sz;
@@ -359,7 +393,7 @@ int qcom_llcc_probe(struct platform_device *pdev, · 2 unmodified lines
359393
360394 ret = qcom_llcc_cfg_program(pdev);
361395 if (ret)
362− return ret;
396+ goto err;
363397
364398 drv_data->ecc_irq = platform_get_irq(pdev, 0);
365399 if (drv_data->ecc_irq >= 0) {
@@ -370,6 +404,9 @@ int qcom_llcc_probe(struct platform_device *pdev, · 4 unmodified lines
370404 dev_err(dev, "Failed to register llcc edac driver\n");
371405 }
372406
407+ return 0;
408+err:
409+ drv_data = ERR_PTR(-ENODEV);
373410 return ret;
374411 }
375412 EXPORT_SYMBOL_GPL(qcom_llcc_probe);
include/linux/soc/qcom/llcc-qcom.h+6−0
@@ -162,6 +162,12 @@ int llcc_slice_deactivate(struct llcc_slice_desc *desc); · 161 unmodified lines
162162 */
163163 int qcom_llcc_probe(struct platform_device *pdev,
164164 const struct llcc_slice_config *table, u32 sz);
165+
166+/**
167+ * qcom_llcc_remove - remove the sct table
168+ * @pdev: Platform device pointer
169+ */
170+int qcom_llcc_remove(struct platform_device *pdev);
165171 #else
166172 static inline struct llcc_slice_desc *llcc_slice_getd(u32 uid)
167173 {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t