Page MenuHomeFreeBSD
Files F177587594

D6015.1794803830.diff
No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D6015.1794803830.diff
View Options

Index: stable/10/sys/fs/msdosfs/direntry.h
===================================================================
--- stable/10/sys/fs/msdosfs/direntry.h
+++ stable/10/sys/fs/msdosfs/direntry.h
@@ -145,7 +145,7 @@
char *mbnambuf_flush(struct mbnambuf *nbp, struct dirent *dp);
void mbnambuf_init(struct mbnambuf *nbp);
-void mbnambuf_write(struct mbnambuf *nbp, char *name, int id);
+int mbnambuf_write(struct mbnambuf *nbp, char *name, int id);
int dos2unixfn(u_char dn[11], u_char *un, int lower,
struct msdosfsmount *pmp);
int unix2dosfn(const u_char *un, u_char dn[12], size_t unlen, u_int gen,
Index: stable/10/sys/fs/msdosfs/msdosfs_conv.c
===================================================================
--- stable/10/sys/fs/msdosfs/msdosfs_conv.c
+++ stable/10/sys/fs/msdosfs/msdosfs_conv.c
@@ -678,7 +678,9 @@
switch (code) {
case 0:
*np = '\0';
- mbnambuf_write(nbp, name, (wep->weCnt & WIN_CNT) - 1);
+ if (mbnambuf_write(nbp, name,
+ (wep->weCnt & WIN_CNT) - 1) != 0)
+ return -1;
return chksum;
case '/':
*np = '\0';
@@ -696,7 +698,9 @@
switch (code) {
case 0:
*np = '\0';
- mbnambuf_write(nbp, name, (wep->weCnt & WIN_CNT) - 1);
+ if (mbnambuf_write(nbp, name,
+ (wep->weCnt & WIN_CNT) - 1) != 0)
+ return -1;
return chksum;
case '/':
*np = '\0';
@@ -714,7 +718,9 @@
switch (code) {
case 0:
*np = '\0';
- mbnambuf_write(nbp, name, (wep->weCnt & WIN_CNT) - 1);
+ if (mbnambuf_write(nbp, name,
+ (wep->weCnt & WIN_CNT) - 1) != 0)
+ return -1;
return chksum;
case '/':
*np = '\0';
@@ -728,7 +734,8 @@
cp += 2;
}
*np = '\0';
- mbnambuf_write(nbp, name, (wep->weCnt & WIN_CNT) - 1);
+ if (mbnambuf_write(nbp, name, (wep->weCnt & WIN_CNT) - 1) != 0)
+ return -1;
return chksum;
}
@@ -1030,7 +1037,7 @@
* This only penalizes portions of substrings that contain more than
* WIN_CHARS bytes when they are first encountered.
*/
-void
+int
mbnambuf_write(struct mbnambuf *nbp, char *name, int id)
{
char *slot;
@@ -1041,7 +1048,7 @@
printf("msdosfs: non-decreasing id: id %d, last id %d\n",
id, nbp->nb_last_id);
#endif
- return;
+ return (EINVAL);
}
/* Will store this substring in a WIN_CHARS-aligned slot. */
@@ -1052,17 +1059,24 @@
#ifdef MSDOSFS_DEBUG
printf("msdosfs: file name length %zu too large\n", newlen);
#endif
- return;
+ return (ENAMETOOLONG);
}
/* Shift suffix upwards by the amount length exceeds WIN_CHARS. */
- if (count > WIN_CHARS && nbp->nb_len != 0)
+ if (count > WIN_CHARS && nbp->nb_len != 0) {
+ if ((id * WIN_CHARS + count + nbp->nb_len) >
+ sizeof(nbp->nb_buf))
+ return (ENAMETOOLONG);
+
bcopy(slot + WIN_CHARS, slot + count, nbp->nb_len);
+ }
/* Copy in the substring to its slot and update length so far. */
bcopy(name, slot, count);
nbp->nb_len = newlen;
nbp->nb_last_id = id;
+
+ return (0);
}
/*

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 16, 4:37 AM (18 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41760264
Default Alt Text
D6015.1794803830.diff (2 KB)

Event Timeline