From: Nicolas Kaiser <nikai@nikai.net>
Date: Fri, 29 Oct 2010 09:41:42 +0000 (+0200)
Subject: telephony: fix return value
X-Git-Tag: v2.6.38-rc1~245^2~44
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b0438a1b71955c425c304a2a483765ef24841766;p=karo-tx-linux.git

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>
---

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)))