diff options
| author | Nick Desaulniers <ndesaulniers@google.com> | 2017-10-24 15:46:34 -0700 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-02-02 01:40:56 +0200 |
| commit | 1cd06c080d87f4f818a30e26244818804fd537d4 (patch) | |
| tree | 4a5722bacdc05ea22f1cca07e724ed25420a6d88 | |
| parent | 42cd08dbef4a96deb019c7b012620bf01e0cb092 (diff) | |
Revert "mmc: sdio: Update the buffer copy to include the last char"
This reverts commit 6ecb02a4e10f09c2b484b1f05c676f8e0ae5f150.
The commits
6ecb02a4e10f09c2b484b1f05c676f8e0ae5f150
6a20c55090dbfc3fa3d5a6c93a71c9f727c0bad8
1149dc7d996c67b8b730c0348bb704a6e8e2b5ca
turn
strcpy(string, buf);
into
strlcpy(string, buf, strlen(buf));
which is equivalent. So let's drop these out of tree patches.
Bug: 67861121
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Change-Id: I8d8e9f089a979e170d4164e046102e0791691e86
Link: https://android.googlesource.com/kernel/msm/+/74be6dae5b243df1ec170e949f714a6d7f0613d7
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
| -rw-r--r-- | drivers/mmc/core/sdio_cis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c index 8b4266a11ee0..4a8508ec8ffd 100644 --- a/drivers/mmc/core/sdio_cis.c +++ b/drivers/mmc/core/sdio_cis.c @@ -55,7 +55,7 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func, for (i = 0; i < nr_strings; i++) { buffer[i] = string; - strlcpy(string, buf, strlen(buf) + 1); + strlcpy(string, buf, strlen(buf)); string += strlen(string) + 1; buf += strlen(buf) + 1; } |