2014-10-18 22:14:58

by Rickard Strandqvist

[permalink] [raw]
Subject: [PATCH 4/5] power: charger-manager.c: Cleaning up missing null-terminate by switching from strncpy to strzcpy

Ensures that the string is null-terminate in connection with the
use of strncpy, by switching from strncpy to strzcpy.

Signed-off-by: Rickard Strandqvist <[email protected]>
---
drivers/power/charger-manager.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 9e4dab4..18dad9e 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -1764,9 +1764,9 @@ static int charger_manager_probe(struct platform_device *pdev)
memcpy(&cm->charger_psy, &psy_default, sizeof(psy_default));

if (!desc->psy_name)
- strncpy(cm->psy_name_buf, psy_default.name, PSY_NAME_MAX);
+ strzcpy(cm->psy_name_buf, psy_default.name, PSY_NAME_MAX);
else
- strncpy(cm->psy_name_buf, desc->psy_name, PSY_NAME_MAX);
+ strzcpy(cm->psy_name_buf, desc->psy_name, PSY_NAME_MAX);
cm->charger_psy.name = cm->psy_name_buf;

/* Allocate for psy properties because they may vary */
--
1.7.10.4