diff mbox series

Fix coverity #292132

Message ID 20200419193104.22351-6-sbabic@denx.de
State Accepted
Headers show
Series Fix coverity #292132 | expand

Commit Message

Stefano Babic April 19, 2020, 7:31 p.m. UTC 
Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 handlers/ubivol_handler.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/handlers/ubivol_handler.c b/handlers/ubivol_handler.c
index 21e88ec..008e9f7 100644
--- a/handlers/ubivol_handler.c
+++ b/handlers/ubivol_handler.c
@@ -564,13 +564,13 @@  static int swap_volume(struct img_type *img, void *data)
 
 		/* swap first -> second */
 		rnvol.ents[2 * count + 0].vol_id = vol_id[0];
-		rnvol.ents[2 * count + 0].name_len = strlen(name[1]);
-		strcpy(rnvol.ents[2 * count + 0].name, name[1]);
+		rnvol.ents[2 * count + 0].name_len = min(strlen(name[1]), UBI_MAX_VOLUME_NAME);
+		strlcpy(rnvol.ents[2 * count + 0].name, name[1], UBI_MAX_VOLUME_NAME);
 
 		/* swap second -> first */
 		rnvol.ents[2 * count + 1].vol_id = vol_id[1];
-		rnvol.ents[2 * count + 1].name_len = strlen(name[0]);
-		strcpy(rnvol.ents[2 * count + 1].name, name[0]);
+		rnvol.ents[2 * count + 1].name_len = min(strlen(name[0]), UBI_MAX_VOLUME_NAME);
+		strlcpy(rnvol.ents[2 * count + 1].name, name[0], UBI_MAX_VOLUME_NAME);
 
 		count++;
 	}