Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 171087
b: refs/heads/master
c: 43ab850
h: refs/heads/master
i:
  171085: 11a9c28
  171083: 28d2738
  171079: d3cc83e
  171071: f4273b4
v: v3
  • Loading branch information
roel kluin authored and David S. Miller committed Oct 30, 2009
1 parent 9a8c704 commit fd0a191
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ac958154e9e1548933fe97e4ecbceb30e01e4a6f
refs/heads/master: 43ab85021e8286e1641928ab3cc542dd1e8c7f94
7 changes: 3 additions & 4 deletions trunk/net/ax25/af_ax25.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit fd0a191

Please sign in to comment.