Replacing strncpy with strlcpy to avoid strings that lacks null terminate. And removed unnecessary magic numbers.
Signed-off-by: Rickard Strandqvist <[email protected]> --- drivers/hid/uhid.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c index 0cb92e3..b72ab0c 100644 --- a/drivers/hid/uhid.c +++ b/drivers/hid/uhid.c @@ -392,12 +392,9 @@ static int uhid_dev_create(struct uhid_device *uhid, goto err_free; } - strncpy(hid->name, ev->u.create.name, 127); - hid->name[127] = 0; - strncpy(hid->phys, ev->u.create.phys, 63); - hid->phys[63] = 0; - strncpy(hid->uniq, ev->u.create.uniq, 63); - hid->uniq[63] = 0; + strlcpy(hid->name, ev->u.create.name, sizeof(hid->name)); + strlcpy(hid->phys, ev->u.create.phys, sizeof(hid->phys)); + strlcpy(hid->uniq, ev->u.create.uniq, sizeof(hid->uniq)); hid->ll_driver = &uhid_hid_driver; hid->bus = ev->u.create.bus; @@ -452,12 +449,9 @@ static int uhid_dev_create2(struct uhid_device *uhid, goto err_free; } - strncpy(hid->name, ev->u.create2.name, 127); - hid->name[127] = 0; - strncpy(hid->phys, ev->u.create2.phys, 63); - hid->phys[63] = 0; - strncpy(hid->uniq, ev->u.create2.uniq, 63); - hid->uniq[63] = 0; + strlcpy(hid->name, ev->u.create2.name, sizeof(hid->name)); + strlcpy(hid->phys, ev->u.create2.phys, sizeof(hid->phys)); + strlcpy(hid->uniq, ev->u.create2.uniq, sizeof(hid->uniq)); hid->ll_driver = &uhid_hid_driver; hid->bus = ev->u.create2.bus; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
