summaryrefslogtreecommitdiffstats
path: root/drivers/telephony
diff options
context:
space:
mode:
authorNicolas Kaiser <nikai@nikai.net>2010-10-29 11:41:42 +0200
committerJiri Kosina <jkosina@suse.cz>2010-10-29 11:41:42 +0200
commitb0438a1b71955c425c304a2a483765ef24841766 (patch)
treef9ca0831d87ca8b83280711a3cbaacee73e87ec2 /drivers/telephony
parent229aebb873e29726b91e076161649cf45154b0bf (diff)
downloadlinux-stable-b0438a1b71955c425c304a2a483765ef24841766.tar.gz
linux-stable-b0438a1b71955c425c304a2a483765ef24841766.tar.bz2
linux-stable-b0438a1b71955c425c304a2a483765ef24841766.zip
telephony: fix return value
If copy_from_user fails, the return value gets overwritten. Signed-off-by: Nicolas Kaiser <nikai@nikai.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/telephony')
-rw-r--r--drivers/telephony/ixj.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index 0d236f4bb8c2..2d1280a7a52b 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -6581,7 +6581,8 @@ static long do_ixj_ioctl(struct file *file_p, unsigned int cmd, unsigned long ar
case IXJCTL_SET_FILTER:
if (copy_from_user(&jf, argp, sizeof(jf)))
retval = -EFAULT;
- retval = ixj_init_filter(j, &jf);
+ else
+ retval = ixj_init_filter(j, &jf);
break;
case IXJCTL_SET_FILTER_RAW:
if (copy_from_user(&jfr, argp, sizeof(jfr)))