undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/maint-lockfile-overflow' into maint

Browse Source 
* mh/maint-lockfile-overflow:
  lockfile: fix buffer overflow in path handling
This commit is contained in:
Junio C Hamano 2013-07-21 22:51:22 -07:00
commit dbed593594
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lockfile.c
View File

@ -124,15 +124,17 @@ static char *resolve_symlink(char *p, size_t s)
static int lock_file(struct lock_file *lk, const char *path, int flags) static int lock_file(struct lock_file *lk, const char *path, int flags)
{ {
if (strlen(path) >= sizeof(lk->filename))
return -1;
strcpy(lk->filename, path);
/* /*
* subtract 5 from size to make sure there's room for adding * subtract 5 from size to make sure there's room for adding
* ".lock" for the lock file name * ".lock" for the lock file name
*/ */
static const size_t max_path_len = sizeof(lk->filename) - 5;
if (strlen(path) >= max_path_len)
return -1;
strcpy(lk->filename, path);
if (!(flags & LOCK_NODEREF)) if (!(flags & LOCK_NODEREF))
resolve_symlink(lk->filename, sizeof(lk->filename)-5); resolve_symlink(lk->filename, max_path_len);
strcat(lk->filename, ".lock"); strcat(lk->filename, ".lock");
lk->fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666); lk->fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666);
if (0 <= lk->fd) { if (0 <= lk->fd) {