From fd0a19192473788b9d64e278512d40ac5114413f Mon Sep 17 00:00:00 2001
From: roel kluin <roel.kluin@gmail.com>
Date: Wed, 14 Oct 2009 05:26:30 +0000
Subject: [PATCH] --- yaml --- r: 171087 b: refs/heads/master c:
 43ab85021e8286e1641928ab3cc542dd1e8c7f94 h: refs/heads/master i:   171085:
 11a9c280ac465c434b25b1cfaf9cda3c3d5b07b1   171083:
 28d27386c53a08b30aa8c6552ae4dab8c234c049   171079:
 d3cc83ea7408c192e08c1e7e5d65aab8707e1814   171071:
 f4273b45251b6d3df7143e6269cb34b8d5247071 v: v3

---
 [refs]                   | 2 +-
 trunk/net/ax25/af_ax25.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 99b89678c55b..bd30b48d07cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac958154e9e1548933fe97e4ecbceb30e01e4a6f
+refs/heads/master: 43ab85021e8286e1641928ab3cc542dd1e8c7f94
diff --git a/trunk/net/ax25/af_ax25.c b/trunk/net/ax25/af_ax25.c
index f05306f168fa..f1e998b2796e 100644
--- a/trunk/net/ax25/af_ax25.c
+++ b/trunk/net/ax25/af_ax25.c
@@ -369,6 +369,9 @@ static int ax25_ctl_ioctl(const unsigned int cmd, void __user *arg)
 	if (ax25_ctl.digi_count > AX25_MAX_DIGIS)
 		return -EINVAL;
 
+	if (ax25_ctl.arg > ULONG_MAX / HZ && ax25_ctl.cmd != AX25_KILL)
+		return -EINVAL;
+
 	digi.ndigi = ax25_ctl.digi_count;
 	for (k = 0; k < digi.ndigi; k++)
 		digi.calls[k] = ax25_ctl.digi_addr[k];
@@ -418,14 +421,10 @@ static int ax25_ctl_ioctl(const unsigned int cmd, void __user *arg)
 		break;
 
 	case AX25_T3:
-		if (ax25_ctl.arg < 0)
-			goto einval_put;
 		ax25->t3 = ax25_ctl.arg * HZ;
 		break;
 
 	case AX25_IDLE:
-		if (ax25_ctl.arg < 0)
-			goto einval_put;
 		ax25->idle = ax25_ctl.arg * 60 * HZ;
 		break;