lib/oofatfs: Fix speculative read in create_name.

djlowther · djlowther · commit 25fb6515663f · 2023-06-21T09:47:44.000+01:00
Signed-off-by: Duncan Lowther &lt;Duncan.Lowther@glasgow.ac.uk&gt;
diff --git a/lib/oofatfs/ff.c b/lib/oofatfs/ff.c
@@ -2821,7 +2821,7 @@ static FRESULT create_name (    /* FR_OK: successful, FR_INVALID_NAME: could not
         if (di >= FF_MAX_LFN) return FR_INVALID_NAME;   /* Reject too long name */
         lfn[di++] = wc;                 /* Store the Unicode character */
     }
-    while (*p == '/' || *p == '\\') p++;    /* Skip duplicated separators if exist */
+    if (wc == '/' || wc == '\\') while (*p == '/' || *p == '\\') p++;    /* Skip duplicated separators if exist */
     *path = p;                          /* Return pointer to the next segment */
     cf = (wc < ' ') ? NS_LAST : 0;      /* Set last segment flag if end of the path */
 

Original file line number	Diff line number	Diff line change
`@@ -2821,7 +2821,7 @@ static FRESULT create_name ( /* FR_OK: successful, FR_INVALID_NAME: could not`
`2821`	`2821`	`if (di >= FF_MAX_LFN) return FR_INVALID_NAME; /* Reject too long name */`
`2822`	`2822`	`lfn[di++] = wc; /* Store the Unicode character */`
`2823`	`2823`	`}`
`2824`		`- while (p == '/' \|\| p == '\\') p++; /* Skip duplicated separators if exist */`
	`2824`	`+ if (wc == '/' \|\| wc == '\\') while (p == '/' \|\| p == '\\') p++; /* Skip duplicated separators if exist */`
`2825`	`2825`	`path = p; / Return pointer to the next segment */`
`2826`	`2826`	`cf = (wc < ' ') ? NS_LAST : 0; /* Set last segment flag if end of the path */`
`2827`	`2827`