jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 23:10:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

volser: Don't overflow volume name

Browse Source 
The maximum volume name length in the VLDB RPCs is VL_MAXNAMELEN
(65), not 64 as used as a hardcoded value in vsprocs. Switch to
using the defined value, and also use strlcat to check that we
don't overflow this.

Caught by coverity (#985849)

Change-Id: I860d4bd4ed9a22185f4a83408d163ce20d21e751
Reviewed-on: http://gerrit.openafs.org/9352
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
This commit is contained in:
Simon Wilkinson 2013-03-02 09:47:53 +00:00 committed by Jeffrey Altman
parent 77aa6c65b7
commit 4f9ec8396d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/volser/vsprocs.c
View File

@ -3014,7 +3014,7 @@ GetTrans(struct nvldbentry *vldbEntryPtr, afs_int32 index,
/* If the volume does not exist, create it */ /* If the volume does not exist, create it */
if (!volid || code) { if (!volid || code) {
char volname[64]; char volname[VL_MAXNAMELEN];
char hoststr[16]; char hoststr[16];
if (volid && (code != VNOVOL)) { if (volid && (code != VNOVOL)) {
@ -3023,7 +3023,16 @@ GetTrans(struct nvldbentry *vldbEntryPtr, afs_int32 index,
goto fail; goto fail;
} }
strcpy(volname, vldbEntryPtr->name); strlcpy(volname, vldbEntryPtr->name, sizeof(volname));
if (strlcat(volname,
tmpVolId?".roclone":".readonly",
sizeof(volname)) >= sizeof(volname)) {
code = ENOMEM;
PrintError("Volume name is too long\n", code);
goto fail;
}
if (tmpVolId) if (tmpVolId)
strcat(volname, ".roclone"); strcat(volname, ".roclone");
else else