2.4.10-pre5 ixj telephony driver
PATCH 1/1 2.4.10-pre5 ixj telephony driver
Hi,
Here's a patch to fix up the broken ixj driver in 2.4.10-pre5. What it does:
1. Changes ixj.c to the proper use of the min() macro in ixj.c
2. Gets ixjuser.h up to date with the current driver
3. Adds a sanity check to ixj.c
Points two and three are taken directly from Alan's tree.
Best regards,
Ole André
---
drivers/telephony/ixj.c renamed from drivers/telephony/ixj.c-orig +10 -7
@@ -2895,15 +2895,15 @@set_current_state (TASK_RUNNING );/* Don't ever copy more than the user asks */ if (j->rec_codec ==ALAW ) -ulaw2alaw (j->read_buffer,min (length, j->read_buffer_size)); - i =copy_to_user (buf, j->read_buffer,min (length, j->read_buffer_size)); + ulaw2alaw(j->read_buffer, min(unsigned int, length, j->read_buffer_size)); + i = copy_to_user(buf, j->read_buffer, min(unsigned int, length, j->read_buffer_size)); j->read_buffer_ready =0 ;if (i) { j->flags.inread =0 ;return -EFAULT ; }else { j->flags.inread =0 ; -return min (length, j->read_buffer_size); + return min(unsigned int, length, j->read_buffer_size); } }
@@ -2975,15 +2975,15 @@remove_wait_queue (&j->write_q, &wait);if (j->write_buffer_wp + count >= j->write_buffer_end) j->write_buffer_wp = j->write_buffer; - i =copy_from_user (j->write_buffer_wp, buf,min (count, j->write_buffer_size)); + i = copy_from_user(j->write_buffer_wp, buf, min(unsigned int, count, j->write_buffer_size));if (i) { j->flags.inwrite =0 ;return -EFAULT ; }if (j->play_codec ==ALAW ) -alaw2ulaw (j->write_buffer_wp,min (count, j->write_buffer_size)); + alaw2ulaw(j->write_buffer_wp, min(unsigned int, count, j->write_buffer_size)); j->flags.inwrite =0 ; -return min (count, j->write_buffer_size); + return min(unsigned int, count, j->write_buffer_size); }static ssize_t ixj_enhanced_write (struct file * file_p,const char *buf,size_t count,loff_t * ppos)
@@ -6693,7 +6693,10 @@ retval =ixj_init_filter_raw (j, &jfr);break ;case IXJCTL_GET_FILTER_HIST : - retval = j->filter_hist[arg]; +if (arg<0 ||arg>3 ) + retval = -EINVAL ; +else + retval = j->filter_hist[arg];break ;case IXJCTL_INIT_TONE :copy_from_user (&ti, (char *) arg,sizeof (ti));
include/linux/ixjuser.h renamed from include/linux/ixjuser.h-orig +91 -24
190 lines not on this page · raw message