Skip to contentSkip to conversation

staging: android: Replace strcpy with strlcpy

PATCH Superseded simran singhal 2 participants 4 messages Mar 11, 2017 Staging

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: android: Replace strcpy with strlcpy

Replace strcpy with strlcpy as strcpy does not check for buffer overflow.
This is found using Flawfinder.

---

v2:
-Correcting the place of the parenthesis

 drivers/staging/android/ashmem.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/android/ashmem.c +2 -1
index 7cbad0d..eb2f4ef 100644
@@ -548,7 +548,8 @@ static int set_name(struct ashmem_area *asma, void __user *name)
 	if (unlikely(asma->file))
 		ret = -EINVAL;
 	else
-		strcpy(asma->name + ASHMEM_NAME_PREFIX_LEN, local_name);
+		strlcpy(asma->name + ASHMEM_NAME_PREFIX_LEN, local_name,
+			sizeof(asma->name + ASHMEM_NAME_PREFIX_LEN));
 
 	mutex_unlock(&ashmem_mutex);
 	return ret;
Signature · 1 line
2.7.4
#1 lore raw
Quoted 18 lines · simran singhal

Replace strcpy with strlcpy as strcpy does not check for buffer overflow.
This is found using Flawfinder.

---

v2:
-Correcting the place of the parenthesis

 drivers/staging/android/ashmem.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/android/ashmem.c +0 -0
index 7cbad0d..eb2f4ef 100644

drivers/staging/android/ashmem.c static int set_name(struct ashmem_area *asma, void __user *name) · line 552

Quoted 6 lines
drivers/staging/android/ashmem.c +2 -1
@@ -548,7 +548,8 @@ static int set_name(struct ashmem_area *asma, void __user *name)
 	if (unlikely(asma->file))
 		ret = -EINVAL;
 	else
-		strcpy(asma->name + ASHMEM_NAME_PREFIX_LEN, local_name);
+		strlcpy(asma->name + ASHMEM_NAME_PREFIX_LEN, local_name,
+			sizeof(asma->name + ASHMEM_NAME_PREFIX_LEN));

This appears to be the old patch.

Actually, looking closer, I don't think this is right at all. There seems to be a goal of leaving some space at the beginning of asma->name. So the amount of space available for local_name would be computed using a subtraction, not an addition.

julia

Quoted 13 lines
drivers/staging/android/ashmem.c +0 -1
 	mutex_unlock(&ashmem_mutex);
 	return ret;
--

2.7.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170311211725.GA12884%40singhal-Inspiron-5558.
For more options, visit https://groups.google.com/d/optout.

#2 lore raw
Quoted 31 lines · Julia Lawall
Quoted 18 lines · simran singhal

Replace strcpy with strlcpy as strcpy does not check for buffer overflow.
This is found using Flawfinder.

---

v2:
-Correcting the place of the parenthesis

 drivers/staging/android/ashmem.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/android/ashmem.c +0 -0
index 7cbad0d..eb2f4ef 100644

drivers/staging/android/ashmem.c static int set_name(struct ashmem_area *asma, void __user *name) · line 552

Quoted 6 lines
drivers/staging/android/ashmem.c +2 -1
@@ -548,7 +548,8 @@ static int set_name(struct ashmem_area *asma, void __user *name)
      if (unlikely(asma->file))
              ret = -EINVAL;
      else
-             strcpy(asma->name + ASHMEM_NAME_PREFIX_LEN, local_name);
+             strlcpy(asma->name + ASHMEM_NAME_PREFIX_LEN, local_name,
+                     sizeof(asma->name + ASHMEM_NAME_PREFIX_LEN));

This appears to be the old patch.

Quoted 5 lines

Actually, looking closer, I don't think this is right at all. There seems to be a goal of leaving some space at the beginning of asma->name. So the amount of space available for local_name would be computed using a subtraction, not an addition.

Julia, By mistake I sent the wrong patch.
And I am not getting you want to mention which space.

Quoted 15 lines

julia

Quoted 13 lines
drivers/staging/android/ashmem.c +0 -1
      mutex_unlock(&ashmem_mutex);
      return ret;
--

2.7.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170311211725.GA12884%40singhal-Inspiron-5558.
For more options, visit https://groups.google.com/d/optout.

#3 lore raw
Quoted 32 lines · SIMRAN SINGHAL
Quoted 31 lines · Julia Lawall
Quoted 18 lines · simran singhal

Replace strcpy with strlcpy as strcpy does not check for buffer overflow.
This is found using Flawfinder.

---

v2:
-Correcting the place of the parenthesis

 drivers/staging/android/ashmem.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/android/ashmem.c +0 -0
index 7cbad0d..eb2f4ef 100644

drivers/staging/android/ashmem.c static int set_name(struct ashmem_area *asma, void __user *name) · line 552

Quoted 6 lines
drivers/staging/android/ashmem.c +2 -1
@@ -548,7 +548,8 @@ static int set_name(struct ashmem_area *asma, void __user *name)
      if (unlikely(asma->file))
              ret = -EINVAL;
      else
-             strcpy(asma->name + ASHMEM_NAME_PREFIX_LEN, local_name);
+             strlcpy(asma->name + ASHMEM_NAME_PREFIX_LEN, local_name,
+                     sizeof(asma->name + ASHMEM_NAME_PREFIX_LEN));

This appears to be the old patch.

Quoted 7 lines
Quoted 5 lines

Actually, looking closer, I don't think this is right at all. There seems to be a goal of leaving some space at the beginning of asma->name. So the amount of space available for local_name would be computed using a subtraction, not an addition.

Julia, By mistake I sent the wrong patch.
And I am not getting you want to mention which space.

The following is the whole asma->name array. The | in the middle is the offset ASHMEM_NAME_PREFIX_LEN. The xxx characters are in the ASHMEM_NAME_PREFIX_LEN region. The space for local_name is only the part indicates with the ys. This space is smaller than the size of asma->name. In your calculation, you are allowing it to be larger. You will potentially overflow the buffer by 2 * ASHMEM_NAME_PREFIX_LEN.

     --------------------------
    |xxxxxxx|yyyyyyyyyyyyyyyyyy|
     --------------------------

julia