staging: speakup: fix wraparound in uaccess length check
PATCH 1/1 staging: speakup: fix wraparound in uaccess length check
From: Samuel Thibault <[email protected]>
From: Samuel Thibault <[email protected]>
If softsynthx_read() is called with count < 3, count - 3 wraps, causing the loop to copy as much data as available to the provided buffer. If softsynthx_read() is invoked through sys_splice(), this causes an unbounded kernel write; but even when userspace just reads from it normally, a small size could cause userspace crashes.
--- drivers/staging/speakup/speakup_soft.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/staging/speakup/speakup_soft.c +5 -1
@@ -198,11 +198,15 @@ static ssize_t softsynthx_read(struct file *fp, char __user *buf, size_t count,int chars_sent =0 ;char __user *cp;char *init; +size_t bytes_per_ch = unicode ?3 :1 ;u16 ch;int empty;unsigned long flags;DEFINE_WAIT (wait); +if (count < bytes_per_ch) +return -EINVAL ; +spin_lock_irqsave (&speakup_info.spinlock, flags);while (1 ) {prepare_to_wait (&speakup_event, &wait,TASK_INTERRUPTIBLE );
@@ -228,7 +232,7 @@ static ssize_t softsynthx_read(struct file *fp, char __user *buf, size_t count, init =get_initstring ();/* Keep 3 bytes available for a 16bit UTF-8-encoded character */ -while (chars_sent <= count -3 ) { +while (chars_sent <= count - bytes_per_ch) {if (speakup_info.flushing) { speakup_info.flushing =0 ; ch ='\x18' ;
Signature · 1 line
2.18.0.203.gfac676dfb9-goog
Quoted 9 lines · Jann Horn
From: Samuel Thibault <[email protected]>
From: Samuel Thibault <[email protected]>
If
softsynthx_read()is called withcount < 3,count - 3wraps, causing the loop to copy as much data as available to the provided buffer. Ifsoftsynthx_read()is invoked throughsys_splice(), this causes an unbounded kernel write; but even when userspace just reads from it normally, a small size could cause userspace crashes.
Or you could try this (completely untested, though):
drivers/staging/speakup/speakup_soft.c +31 -44
@@ -192,13 +192,10 @@ static int softsynth_close(struct inode *inode, struct file *fp)return 0 ; } -static ssize_t softsynthx_read (struct file *fp,char __user *buf,size_t count, -loff_t *pos,int unicode) +static ssize_t softsynthx_read_iter (struct kiocb *iocb,struct iov_iter *to,int unicode) {int chars_sent =0 ; -char __user *cp;char *init; -u16 ch;int empty;unsigned long flags;DEFINE_WAIT (wait);
@@ -211,7 +208,7 @@ static ssize_t softsynthx_read(struct file *fp, char __user *buf, size_t count,if (!synth_buffer_empty () || speakup_info.flushing)break ;spin_unlock_irqrestore (&speakup_info.spinlock, flags); -if (fp->f_flags &O_NONBLOCK ) { +if (iocb->ki_flags &IOCB_NOWAIT ) {finish_wait (&speakup_event, &wait);return -EAGAIN ; }
@@ -224,11 +221,14 @@ static ssize_t softsynthx_read(struct file *fp, char __user *buf, size_t count, }finish_wait (&speakup_event, &wait); - cp = buf; init =get_initstring ();/* Keep 3 bytes available for a 16bit UTF-8-encoded character */ -while (chars_sent <= count -3 ) { +while (iov_iter_count (to)) { +u_char s[3 ]; +int l, n; +u16 ch; +if (speakup_info.flushing) { speakup_info.flushing =0 ; ch ='\x18' ;
@@ -244,60 +244,47 @@ static ssize_t softsynthx_read(struct file *fp, char __user *buf, size_t count,spin_unlock_irqrestore (&speakup_info.spinlock, flags);if ((!unicode && ch <0x100 ) || (unicode && ch <0x80 )) { -u_char c = ch; - -if (copy_to_user (cp, &c,1 )) -return -EFAULT ; - - chars_sent++; - cp++; + s[0 ] = ch; + l =1 ; }else if (unicode && ch <0x800 ) { -u_char s[2 ] = { -0xc0 | (ch >>6 ), -0x80 | (ch &0x3f ) - }; - -if (copy_to_user (cp, s,sizeof (s))) -return -EFAULT ; - - chars_sent +=sizeof (s); - cp +=sizeof (s); + s[0 ] =0xc0 | (ch >>6 ); + s[1 ] =0x80 | (ch &0x3f ); + l =2 ; }else if (unicode) { -u_char s[3 ] = { -0xe0 | (ch >>12 ), -0x80 | ((ch >>6 ) &0x3f ), -0x80 | (ch &0x3f ) - }; - -if (copy_to_user (cp, s,sizeof (s))) -return -EFAULT ; - - chars_sent +=sizeof (s); - cp +=sizeof (s); + s[0 ] =0xe0 | (ch >>12 ); + s[1 ] =0x80 | ((ch >>6 ) &0x3f ); + s[2 ] =0x80 | (ch &0x3f ); + l =3 ; } - + n =copy_to_iter (s, l, to); +if (n != l) { +iov_iter_revert (to, n); +spin_lock_irqsave (&speakup_info.spinlock, flags); +break ; + } + chars_sent += l;spin_lock_irqsave (&speakup_info.spinlock, flags); } - *pos += chars_sent; + iocb->ki_pos += chars_sent; empty =synth_buffer_empty ();spin_unlock_irqrestore (&speakup_info.spinlock, flags);if (empty) {speakup_start_ttys (); - *pos =0 ; + iocb->ki_pos =0 ; }return chars_sent; } -static ssize_t softsynth_read (struct file *fp,char __user *buf,size_t count, +static ssize_t softsynth_read_iter (struct kiocb *iocb,struct iov_iter *to) loff_t *pos) { -return softsynthx_read (fp, buf, count, pos,0 ); +return softsynthx_read_iter (iocb, to,0 ); } -static ssize_t softsynthu_read (struct file *fp,char __user *buf,size_t count, +static ssize_t softsynthu_read_iter (struct kiocb *iocb,struct iov_iter *to) loff_t *pos) { -return softsynthx_read (fp, buf, count, pos,1 ); +return softsynthx_read_iter (iocb, to,1 ); }static int last_index;
@@ -343,7 +330,7 @@ static unsigned char get_index(struct spk_synth *synth)static const struct file_operations softsynth_fops = { .owner =THIS_MODULE , .poll = softsynth_poll, - .read = softsynth_read, + .read_iter = softsynth_read_iter, .write = softsynth_write, .open = softsynth_open, .release = softsynth_close,
@@ -352,7 +339,7 @@ static const struct file_operations softsynth_fops = {static const struct file_operations softsynthu_fops = { .owner =THIS_MODULE , .poll = softsynth_poll, - .read = softsynthu_read, + .read_iter = softsynthu_read_iter, .write = softsynth_write, .open = softsynth_open, .release = softsynth_close,
Quoted 6 lines · Al Viro
Quoted 4 lines · Jann Horn
From: Samuel Thibault <[email protected]>
From: Samuel Thibault <[email protected]>
Quoted 7 lines
Quoted 5 lines
If
softsynthx_read()is called withcount < 3,count - 3wraps, causing the loop to copy as much data as available to the provided buffer. Ifsoftsynthx_read()is invoked throughsys_splice(), this causes an unbounded kernel write; but even when userspace just reads from it normally, a small size could cause userspace crashes.Or you could try this (completely untested, though):
I think this has the same problem as my original buggy patch: At the point where you notice that you'd overflow the buffer, you've already consumed a character from the synth buffer. You'd have to put it back, and since the spinlock protecting it has been dropped, that's a bit weird.
Also, I'm not sure whether Greg prefers fixes for stable kernels that don't also contain cleanup?
Quoted 4 lines
drivers/staging/speakup/speakup_soft.c +0
-0
[...]
Quoted 68 lines
drivers/staging/speakup/speakup_soft.c +20
-31@@ -224,11 +221,14 @@ static ssize_t softsynthx_read(struct file *fp, char __user *buf, size_t count, }finish_wait (&speakup_event, &wait); - cp = buf; init =get_initstring ();/* Keep 3 bytes available for a 16bit UTF-8-encoded character */ -while (chars_sent <= count -3 ) { +while (iov_iter_count (to)) { +u_char s[3 ]; +int l, n; +u16 ch; +if (speakup_info.flushing) { speakup_info.flushing =0 ; ch ='\x18' ;@@ -244,60 +244,47 @@ static ssize_t softsynthx_read(struct file *fp, char __user *buf, size_t count,spin_unlock_irqrestore (&speakup_info.spinlock, flags);if ((!unicode && ch <0x100 ) || (unicode && ch <0x80 )) { -u_char c = ch; - -if (copy_to_user (cp, &c,1 )) -return -EFAULT ; - - chars_sent++; - cp++; + s[0 ] = ch; + l =1 ; }else if (unicode && ch <0x800 ) { -u_char s[2 ] = { -0xc0 | (ch >>6 ), -0x80 | (ch &0x3f ) - }; - -if (copy_to_user (cp, s,sizeof (s))) -return -EFAULT ; - - chars_sent +=sizeof (s); - cp +=sizeof (s); + s[0 ] =0xc0 | (ch >>6 ); + s[1 ] =0x80 | (ch &0x3f ); + l =2 ; }else if (unicode) { -u_char s[3 ] = { -0xe0 | (ch >>12 ), -0x80 | ((ch >>6 ) &0x3f ), -0x80 | (ch &0x3f ) - }; - -if (copy_to_user (cp, s,sizeof (s))) -return -EFAULT ; - - chars_sent +=sizeof (s); - cp +=sizeof (s); + s[0 ] =0xe0 | (ch >>12 ); + s[1 ] =0x80 | ((ch >>6 ) &0x3f ); + s[2 ] =0x80 | (ch &0x3f ); + l =3 ; } - + n =copy_to_iter (s, l, to); +if (n != l) { +iov_iter_revert (to, n); +spin_lock_irqsave (&speakup_info.spinlock, flags); +break ; + }
Greg Kroah-Hartman
maintainerQuoted 15 lines · Jann Horn
Quoted 6 lines · Al Viro
Quoted 4 lines · Jann Horn
From: Samuel Thibault <[email protected]>
From: Samuel Thibault <[email protected]>
Quoted 7 lines
Quoted 5 lines
If
softsynthx_read()is called withcount < 3,count - 3wraps, causing the loop to copy as much data as available to the provided buffer. Ifsoftsynthx_read()is invoked throughsys_splice(), this causes an unbounded kernel write; but even when userspace just reads from it normally, a small size could cause userspace crashes.Or you could try this (completely untested, though):
Quoted 8 lines
I think this has the same problem as my original buggy patch: At the point where you notice that you'd overflow the buffer, you've already consumed a character from the synth buffer. You'd have to put it back, and since the spinlock protecting it has been dropped, that's a bit weird.
Also, I'm not sure whether Greg prefers fixes for stable kernels that don't also contain cleanup?
For staging code, I really don't care, as long as it's fixing an issue :)
thanks,
greg k-h