staging: istallion: fix arbitrary kernel memory reads/writes

stli_brdstats is defined as global variable.  After de-BKL-ization in
the patch b4eda9cb48 an access to the variable is not serialized
anymore.  This leads to the race window between the check and the use
in stli_getbrdstats():

        if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t)))
                return -EFAULT;
        if (stli_brdstats.brd >= STL_MAXBRDS) <<<
                return -ENODEV;
        brdp = stli_brds[stli_brdstats.brd];  <<<

If one process calls COM_GETBRDSTATS ioctl() with sane .brd, second
process calls COM_GETBRDSTATS ioctl() with invalid .brd, and the
second process' copy_from_user() executes exactly between the check and
stli_brds[] indexation of the first process, then the first process gets
contents of memory at *stli_brds[stli_brdstats.brd] address.  Also
the resulting .nrpanels field may be too big, in this case
stli_brdstats.panels array overflows.

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Vasiliy Kulikov 2011-04-14 19:56:25 +04:00 коммит произвёл Greg Kroah-Hartman
Родитель 7816c45bf1
Коммит 5d46f32667
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -186,7 +186,6 @@ static struct ktermios stli_deftermios = {
* re-used for each stats call. * re-used for each stats call.
*/ */
static comstats_t stli_comstats; static comstats_t stli_comstats;
static combrd_t stli_brdstats;
static struct asystats stli_cdkstats; static struct asystats stli_cdkstats;
/*****************************************************************************/ /*****************************************************************************/
@ -4005,6 +4004,7 @@ static int stli_getbrdstats(combrd_t __user *bp)
{ {
struct stlibrd *brdp; struct stlibrd *brdp;
unsigned int i; unsigned int i;
combrd_t stli_brdstats;
if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t))) if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t)))
return -EFAULT; return -EFAULT;