d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some problems which may lead to a panic:

Browse Source 
- right order of src and dst in memcpy
 - NULL out the clips after freeing to prevent an accident

Noticed by:	hselasky
This commit is contained in:
Alexander Leidinger 2010-03-26 08:42:11 +00:00
parent bfd506a024
commit 90782c0a14
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/compat/linux/linux_ioctl.c
View File

@ -2711,7 +2711,7 @@ linux_v4l_clip_copy(void *lvc, struct video_clip **ppvc)
/* XXX: If there can be no concurrency: s/M_NOWAIT/M_WAITOK/ */ /* XXX: If there can be no concurrency: s/M_NOWAIT/M_WAITOK/ */
if ((*ppvc = malloc(sizeof(**ppvc), M_LINUX, M_NOWAIT)) == NULL) if ((*ppvc = malloc(sizeof(**ppvc), M_LINUX, M_NOWAIT)) == NULL)
return (ENOMEM); /* XXX: linux has no ENOMEM here */ return (ENOMEM); /* XXX: linux has no ENOMEM here */
memcpy(&vclip, *ppvc, sizeof(vclip)); memcpy(*ppvc, &vclip, sizeof(vclip));
(*ppvc)->next = NULL; (*ppvc)->next = NULL;
return (0); return (0);
} }
@ -2726,6 +2726,8 @@ linux_v4l_cliplist_free(struct video_window *vw)
ppvc_next = &((*ppvc)->next); ppvc_next = &((*ppvc)->next);
free(*ppvc, M_LINUX); free(*ppvc, M_LINUX);
} }
vw->clips = NULL;
return (0); return (0);
} }