diff options
| author | Simon Arlott <simon@octiron.net> | 2020-11-26 00:28:08 +0000 |
|---|---|---|
| committer | Pavel Shilovsky <pshilov@microsoft.com> | 2020-12-16 15:51:27 -0800 |
| commit | 8f46aaadffde42ef0c89e97c0443ee7944708d94 (patch) | |
| tree | 97a41bb94ec9fb8f273e0cc3a8821903a61996da /mount.cifs.c | |
| parent | 4205fdc411701ffc323769d41508e0875b9d63d4 (diff) | |
| download | cifs-utils-8f46aaadffde42ef0c89e97c0443ee7944708d94.tar.gz cifs-utils-8f46aaadffde42ef0c89e97c0443ee7944708d94.tar.bz2 cifs-utils-8f46aaadffde42ef0c89e97c0443ee7944708d94.zip | |
Add missing position handling to mount parameters gid/backup_gid/snapshot
The code tries to optimise for the last parameter not needing to update
the position which means that every time a new one is added to the end
by copying and pasting, the string position is not updated.
That makes it impossible to use backup_uid=/backup_gid=/snapshot= after
gid= or snapshot= after backup_gid= because part of the string is
overwritten and contains invalid keys like "gbackup_uid".
Prepare for the next parameter to be added on the end by updating the
position for snapshot= even though it will be unused.
Diffstat (limited to 'mount.cifs.c')
| -rw-r--r-- | mount.cifs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mount.cifs.c b/mount.cifs.c index 2474e98..ff07232 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -1245,6 +1245,7 @@ nocopy: out_len++; } snprintf(out + out_len, word_len + 5, "gid=%s", txtbuf); + out_len = strlen(out); } if (got_bkupuid) { word_len = snprintf(txtbuf, sizeof(txtbuf), "%u", bkupuid); @@ -1276,6 +1277,7 @@ nocopy: out_len++; } snprintf(out + out_len, word_len + 11, "backupgid=%s", txtbuf); + out_len = strlen(out); } if (got_snapshot) { word_len = snprintf(txtbuf, sizeof(txtbuf), "%llu", snapshot); @@ -1291,6 +1293,7 @@ nocopy: out_len++; } snprintf(out + out_len, word_len + 11, "snapshot=%s", txtbuf); + out_len = strlen(out); } return 0; |