Date: Thu, 29 Mar 2018 15:00:48 +0000 (UTC) From: Ravi Pokala <rpokala@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r331733 - stable/11/sys/dev/jedec_dimm Message-ID: <201803291500.w2TF0m5W041640@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpokala Date: Thu Mar 29 15:00:48 2018 New Revision: 331733 URL: https://svnweb.freebsd.org/changeset/base/331733 Log: MFC 331345: jedec_dimm: Use correct string length when populating sc->slotid_str Don't limit the copy to the size of the target string *pointer* (always 4 on 32-bit / 8 on 64-bit). Instead, just use strdup(). Modified: stable/11/sys/dev/jedec_dimm/jedec_dimm.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/jedec_dimm/jedec_dimm.c ============================================================================== --- stable/11/sys/dev/jedec_dimm/jedec_dimm.c Thu Mar 29 14:27:40 2018 (r331732) +++ stable/11/sys/dev/jedec_dimm/jedec_dimm.c Thu Mar 29 15:00:48 2018 (r331733) @@ -341,10 +341,7 @@ jedec_dimm_attach(device_t dev) if (resource_string_value(device_get_name(dev), device_get_unit(dev), "slotid", &slotid_str) == 0) { if (slotid_str != NULL) { - sc->slotid_str = malloc(strlen(slotid_str) + 1, - M_DEVBUF, (M_WAITOK | M_ZERO)); - strlcpy(sc->slotid_str, slotid_str, - sizeof(sc->slotid_str)); + sc->slotid_str = strdup(slotid_str, M_DEVBUF); SYSCTL_ADD_STRING(ctx, children, OID_AUTO, "slotid", CTLFLAG_RD | CTLFLAG_MPSAFE, sc->slotid_str, 0, "DIMM Slot Identifier");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803291500.w2TF0m5W041640>