linux-kernel - Re: [PATCH 3/5] vt: use copy_to_user instead of __put_user in GIO

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170605173416.73da4975@lxorguk.ukuu.org.uk>
Date:   Mon, 5 Jun 2017 17:34:16 +0100
From:   Alan Cox <gnomes@...rguk.ukuu.org.uk>
To:     Adam Borowski <kilobyte@...band.pl>
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Jiri Slaby <jslaby@...e.com>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 3/5] vt: use copy_to_user instead of __put_user in
 GIO_UNIMAP ioctl

> @@ -775,13 +775,11 @@ int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct uni
>  		}
>  	}
>  	console_unlock();
> -	for (i = min(ect, ct), plist = unilist; i; i--, list++, plist++) {
> -		__put_user(plist->unicode, &list->unicode);
> -		__put_user(plist->fontpos, &list->fontpos);
> -	}
> -	__put_user(ect, uct);
> +	if (copy_to_user(list, unilist, min(ect, ct) * sizeof(struct unipair)))
> +		ret = -EFAULT;
> +	put_user(ect, uct);
>  	kfree(unilist);
> -	return ((ect <= ct) ? 0 : -ENOMEM);
> +	return ret ? ret : (ect <= ct) ? 0 : -ENOMEM;
>  }


The rest looks good but that line needs taking out and shooting.

Alan