Date: Fri, 26 Mar 2010 08:42:11 +0000 (UTC) From: Alexander Leidinger <netchild@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r205678 - head/sys/compat/linux Message-ID: <201003260842.o2Q8gBfZ093025@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: netchild Date: Fri Mar 26 08:42:11 2010 New Revision: 205678 URL: http://svn.freebsd.org/changeset/base/205678 Log: Fix some problems which may lead to a panic: - right order of src and dst in memcpy - NULL out the clips after freeing to prevent an accident Noticed by: hselasky Modified: head/sys/compat/linux/linux_ioctl.c Modified: head/sys/compat/linux/linux_ioctl.c ============================================================================== --- head/sys/compat/linux/linux_ioctl.c Fri Mar 26 08:05:30 2010 (r205677) +++ head/sys/compat/linux/linux_ioctl.c Fri Mar 26 08:42:11 2010 (r205678) @@ -2711,7 +2711,7 @@ linux_v4l_clip_copy(void *lvc, struct vi /* XXX: If there can be no concurrency: s/M_NOWAIT/M_WAITOK/ */ if ((*ppvc = malloc(sizeof(**ppvc), M_LINUX, M_NOWAIT)) == NULL) return (ENOMEM); /* XXX: linux has no ENOMEM here */ - memcpy(&vclip, *ppvc, sizeof(vclip)); + memcpy(*ppvc, &vclip, sizeof(vclip)); (*ppvc)->next = NULL; return (0); } @@ -2726,6 +2726,8 @@ linux_v4l_cliplist_free(struct video_win ppvc_next = &((*ppvc)->next); free(*ppvc, M_LINUX); } + vw->clips = NULL; + return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003260842.o2Q8gBfZ093025>