Skip to contentSkip to conversation

CIFS: Fix a potencially linear read overflow

PATCH In review Len Baker 4 participants 5 messages Aug 17, 2021 – Aug 20, 2021

Subsystems (2)
lore
Share & tools
lore

Len Baker

author
#0 lore raw

PATCH 1/1 CIFS: Fix a potencially linear read overflow

strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated.

Also, the strnlen() call does not avoid the read overflow in the strlcpy function when a not NUL-terminated string is passed.

So, replace this block by a call to kstrndup() that avoids this type of overflow and does the same.

Fixes 066ce6899484d ("cifs: rename cifs_strlcpy_to_host and make it use new functions")
---
 fs/cifs/cifs_unicode.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
fs/cifs/cifs_unicode.c +2 -7
index 9bd03a231032..171ad8b42107 100644
@@ -358,14 +358,9 @@ cifs_strndup_from_utf16(const char *src, const int maxlen,
 		if (!dst)
 			return NULL;
 		cifs_from_utf16(dst, (__le16 *) src, len, maxlen, codepage,
-			       NO_MAP_UNI_RSVD);
+				NO_MAP_UNI_RSVD);
 	} else {
-		len = strnlen(src, maxlen);
-		len++;
-		dst = kmalloc(len, GFP_KERNEL);
-		if (!dst)
-			return NULL;
-		strlcpy(dst, src, len);
+		dst = kstrndup(src, maxlen, GFP_KERNEL);
 	}
 
 	return dst;

--
2.25.1

Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Len Baker

strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated.

Also, the strnlen() call does not avoid the read overflow in the strlcpy function when a not NUL-terminated string is passed.

Quoted 8 lines

So, replace this block by a call to kstrndup() that avoids this type of overflow and does the same.

Fixes 066ce6899484d ("cifs: rename cifs_strlcpy_to_host and make it use new functions")
---
 fs/cifs/cifs_unicode.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
#2 lore raw

tentatively merged into cifs-2.6.git for-next pending testing

Quoted 20 lines · Paulo Alcantara
Quoted 7 lines · Len Baker

strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated.

Also, the strnlen() call does not avoid the read overflow in the strlcpy function when a not NUL-terminated string is passed.

Quoted 8 lines

So, replace this block by a call to kstrndup() that avoids this type of overflow and does the same.

Fixes 066ce6899484d ("cifs: rename cifs_strlcpy_to_host and make it use new functions")
---
 fs/cifs/cifs_unicode.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
Signature · 3 lines
Thanks,

Steve
Reviewed-by on v1 1/1
#3 lore raw
In reply to Len Baker
Quoted 38 lines · Len Baker

strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated.

Also, the strnlen() call does not avoid the read overflow in the strlcpy function when a not NUL-terminated string is passed.

So, replace this block by a call to kstrndup() that avoids this type of overflow and does the same.

Fixes 066ce6899484d ("cifs: rename cifs_strlcpy_to_host and make it use new functions")
---
 fs/cifs/cifs_unicode.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
fs/cifs/cifs_unicode.c +2 -8
index 9bd03a231032..171ad8b42107 100644
@@ -358,14 +358,9 @@ cifs_strndup_from_utf16(const char *src, const int maxlen,
 		if (!dst)
 			return NULL;
 		cifs_from_utf16(dst, (__le16 *) src, len, maxlen, codepage,
-			       NO_MAP_UNI_RSVD);
+				NO_MAP_UNI_RSVD);
 	} else {
-		len = strnlen(src, maxlen);
-		len++;
-		dst = kmalloc(len, GFP_KERNEL);
-		if (!dst)
-			return NULL;
-		strlcpy(dst, src, len);
+		dst = kstrndup(src, maxlen, GFP_KERNEL);
 	}
 
 	return dst;
--
Quoted 2 lines

2.25.1

#4 lore raw

Added RB and repushed to cifs-2.6.git for-next

Quoted 45 lines · Jeff Layton
Quoted 38 lines · Len Baker

strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated.

Also, the strnlen() call does not avoid the read overflow in the strlcpy function when a not NUL-terminated string is passed.

So, replace this block by a call to kstrndup() that avoids this type of overflow and does the same.

Fixes 066ce6899484d ("cifs: rename cifs_strlcpy_to_host and make it use new functions")
---
 fs/cifs/cifs_unicode.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
fs/cifs/cifs_unicode.c +2 -8
index 9bd03a231032..171ad8b42107 100644
@@ -358,14 +358,9 @@ cifs_strndup_from_utf16(const char *src, const int maxlen,
              if (!dst)
                      return NULL;
              cifs_from_utf16(dst, (__le16 *) src, len, maxlen, codepage,
-                            NO_MAP_UNI_RSVD);
+                             NO_MAP_UNI_RSVD);
      } else {
-             len = strnlen(src, maxlen);
-             len++;
-             dst = kmalloc(len, GFP_KERNEL);
-             if (!dst)
-                     return NULL;
-             strlcpy(dst, src, len);
+             dst = kstrndup(src, maxlen, GFP_KERNEL);
      }
 
      return dst;
--
Quoted 2 lines

2.25.1

Signature · 3 lines
Thanks,

Steve