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

aklog: Avoid overflows in get_afs_mountpoint

Browse Source 
When working with the fixed length cellname buffer, use
strlcat and strlcpy rather than strcat and strcpy.

Caught by coverity (#985763)

Reviewed-on: http://gerrit.openafs.org/9445
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 19d2683d71)

Change-Id: I91c169380600496a8b5148fffcb1a21feb1eee29
Reviewed-on: http://gerrit.openafs.org/11059
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
This commit is contained in:
Simon Wilkinson 2013-03-02 12:09:42 +00:00 committed by Stephan Wiesand
parent a68deb7fc5
commit 110b2b674f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/aklog/aklog.c
View File

@ -1125,8 +1125,7 @@ get_afs_mountpoint(char *file, char *mountpoint, int size)
struct ViceIoctl vio;
char cellname[BUFSIZ];
memset(our_file, 0, sizeof(our_file));
strcpy(our_file, file);
strlcpy(our_file, file, sizeof(our_file));
if ((last_component = strrchr(our_file, DIR))) {
*last_component++ = 0;
@ -1152,8 +1151,8 @@ get_afs_mountpoint(char *file, char *mountpoint, int size)
vio.out = cellname;
if (!pioctl(file, VIOC_FILE_CELL_NAME, &vio, 1)) {
strcat(cellname, VOLMARKERSTRING);
strcat(cellname, mountpoint + 1);
strlcat(cellname, VOLMARKERSTRING, sizeof(cellname));
strlcat(cellname, mountpoint + 1, sizeof(cellname));
memset(mountpoint + 1, 0, size - 1);
strcpy(mountpoint + 1, cellname);
}