evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

max_path: static buffer for symlink path

Browse source 
added nfs41_abs_path symlink to struct open_upcall_args. we can't write the symlink target back to args->path anymore, since it's a pointer into the upcall buffer

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2010-10-12 10:06:45 -04:00
parent 6d2b631080
commit 66d4ea8e0b
3 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
daemon/open.c
View file

@ -303,9 +303,15 @@ static int follow_link(
path_offset = (state->parent.name.name + state->parent.name.len) - path_offset = (state->parent.name.name + state->parent.name.len) -
state->path.path; state->path.path;
/* update the path with the results from link */ /* copy the path and update it with the results from link */
status = abs_path_link(&args->path, args->symlink.len = state->path.len;
args->path.path + path_offset, link, link_len); if (FAILED(StringCchCopyNA(args->symlink.path, NFS41_MAX_PATH_LEN,
state->path.path, state->path.len))) {
status = ERROR_BUFFER_OVERFLOW;
goto out;
}
status = abs_path_link(&args->symlink,
args->symlink.path + path_offset, link, link_len);
if (status) { if (status) {
eprintf("abs_path_link() failed with %d\n", status); eprintf("abs_path_link() failed with %d\n", status);
status = ERROR_PATH_NOT_FOUND; status = ERROR_PATH_NOT_FOUND;
@ -448,20 +454,16 @@ int marshall_open(unsigned char *buffer, uint32_t *length, nfs41_upcall *upcall)
status = safe_write(&buffer, length, &args->changeattr, sizeof(args->changeattr)); status = safe_write(&buffer, length, &args->changeattr, sizeof(args->changeattr));
if (status) goto out; if (status) goto out;
if (upcall->last_error == ERROR_REPARSE) { if (upcall->last_error == ERROR_REPARSE) {
/* convert args->path to wchar */ unsigned short len = (args->symlink.len + 1) * sizeof(WCHAR);
WCHAR wpath[NFS41_MAX_PATH_LEN]; status = safe_write(&buffer, length, &len, sizeof(len));
unsigned short len = (unsigned short)MultiByteToWideChar( if (status) goto out;
CP_UTF8, 0, args->path.path, args->path.len, wpath, NFS41_MAX_PATH_LEN); /* convert args->symlink to wchar */
if (len == 0) { if (*length <= len || !MultiByteToWideChar(CP_UTF8, 0,
args->symlink.path, args->symlink.len,
(LPWSTR)buffer, len / sizeof(WCHAR))) {
status = ERROR_BUFFER_OVERFLOW; status = ERROR_BUFFER_OVERFLOW;
goto out; goto out;
} }
wpath[len++] = L'\0';
len *= sizeof(WCHAR);
dprintf(2, "ERROR_REPARSE -> '%S' [%u]\n", wpath, len);
status = safe_write(&buffer, length, &len, sizeof(len));
if (status) goto out;
status = safe_write(&buffer, length, wpath, len);
} }
dprintf(2, "NFS41_OPEN: passing open_state=0x%p mode %o changeattr 0x%x\n", dprintf(2, "NFS41_OPEN: passing open_state=0x%p mode %o changeattr 0x%x\n",
args->state, args->mode, args->changeattr); args->state, args->mode, args->changeattr);

3
daemon/upcall.h
View file

@ -40,9 +40,10 @@ typedef struct __unmount_upcall_args {
} unmount_upcall_args; } unmount_upcall_args;
typedef struct __open_upcall_args { typedef struct __open_upcall_args {
const char *path; nfs41_abs_path symlink;
FILE_BASIC_INFO basic_info; FILE_BASIC_INFO basic_info;
FILE_STANDARD_INFO std_info; FILE_STANDARD_INFO std_info;
const char *path;
nfs41_root *root; nfs41_root *root;
nfs41_open_state *state; nfs41_open_state *state;
ULONG access_mask; ULONG access_mask;

2
sys/nfs41_driver.c
View file

@ -2568,7 +2568,7 @@ NTSTATUS nfs41_Create(
goto out; goto out;
} }
if (entry->errno == ERROR_REPARSE) { if (entry->status == NO_ERROR && entry->errno == ERROR_REPARSE) {
/* symbolic link handling. when attempting to open a symlink when the /* symbolic link handling. when attempting to open a symlink when the
* FILE_OPEN_REPARSE_POINT flag is not set, replace the filename with * FILE_OPEN_REPARSE_POINT flag is not set, replace the filename with
* the symlink target's by calling RxPrepareToReparseSymbolicLink() * the symlink target's by calling RxPrepareToReparseSymbolicLink()