Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7c64b9f3f584008000cf3b960f25cd6a68fce191

Authored by Jarek Poplawski
Committed by David S. Miller
1 parent 926e61b7c4
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

pkt_sched: Fix qdisc_create on stab error handling 

If qdisc_get_stab returns error in qdisc_create there is skipped qdisc
ops->destroy, which is necessary because it's after ops->init at the
moment, so memory leaks are quite probable.

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -809,7 +809,7 @@
809 809 stab = qdisc_get_stab(tca[TCA_STAB]);
810 810 if (IS_ERR(stab)) {
811 811 err = PTR_ERR(stab);
812   - goto err_out3;
  812 + goto err_out4;
813 813 }
814 814 sch->stab = stab;
815 815 }
... ... @@ -838,7 +838,6 @@
838 838 return sch;
839 839 }
840 840 err_out3:
841   - qdisc_put_stab(sch->stab);
842 841 dev_put(dev);
843 842 kfree((char *) sch - sch->padded);
844 843 err_out2:
... ... @@ -852,6 +851,7 @@
852 851 * Any broken qdiscs that would require a ops->reset() here?
853 852 * The qdisc was never in action so it shouldn't be necessary.
854 853 */
  854 + qdisc_put_stab(sch->stab);
855 855 if (ops->destroy)
856 856 ops->destroy(sch);
857 857 goto err_out3;