Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'edac_urgent_for_v7.1_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC fix from Borislav Petkov:
- Fix a string leak in the versalnet driver
* tag 'edac_urgent_for_v7.1_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
EDAC/versalnet: Fix device name memory leak
+2
-8
+2
-8
drivers/edac/versalnet_edac.c
+2
-8
drivers/edac/versalnet_edac.c
···
777
777
u32 num_chans, rank, dwidth, config;
778
778
struct edac_mc_layer layers[2];
779
779
struct mem_ctl_info *mci;
780
+
char name[MC_NAME_LEN];
780
781
struct device *dev;
781
782
enum dev_type dt;
782
-
char *name;
783
783
int rc;
784
784
785
785
config = priv->adec[CONF + i * ADEC_NUM];
···
813
813
layers[1].is_virt_csrow = false;
814
814
815
815
rc = -ENOMEM;
816
-
name = kzalloc(MC_NAME_LEN, GFP_KERNEL);
817
-
if (!name)
818
-
return rc;
819
-
820
816
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
821
817
if (!dev)
822
-
goto err_name_free;
818
+
return rc;
823
819
824
820
mci = edac_mc_alloc(i, ARRAY_SIZE(layers), layers, sizeof(struct mc_priv));
825
821
if (!mci) {
···
854
858
edac_mc_free(mci);
855
859
err_dev_free:
856
860
kfree(dev);
857
-
err_name_free:
858
-
kfree(name);
859
861
860
862
return rc;
861
863
}