ipvs: Add boundary check on ioctl arguments
Subsystems (4)
PATCH 1/1 ipvs: Add boundary check on ioctl arguments
Quoted 2 lines
From
761a182f96b3707e1fee44e1079ba227e48745d1Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <[email protected]>
Date: Wed, 30 Sep 2009 13:05:51 +0200
Subject: [PATCH] ipvs: Add boundary check on ioctl arguments
The ipvs code has a nifty system for doing the size of ioctl command copies; it defines an array with values into which it indexes the cmd to find the right length.
Unfortunately, the ipvs code forgot to check if the cmd was in the range that the array provides, allowing for an index outside of the array, which then gives a "garbage" result into the length, which then gets used for copying into a stack buffer.
Fix this by adding sanity checks on these as well as the copy size.
--- net/netfilter/ipvs/ip_vs_ctl.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +13 -1
@@ -2077,6 +2077,10 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)if (!capable (CAP_NET_ADMIN ))return -EPERM ; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_SET_MAX +1 ) +return -EINVAL ; +if (len <0 || len >MAX_ARG_LEN ) +return -EINVAL ;if (len != set_arglen[SET_CMDID (cmd)]) {pr_err ("set_ctl: len %u != %u\n" , len, set_arglen[SET_CMDID (cmd)]);
@@ -2353,17 +2357,25 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) {unsigned char arg[128 ];int ret =0 ; +unsigned int copylen;if (!capable (CAP_NET_ADMIN ))return -EPERM ; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_GET_MAX +1 ) +return -EINVAL ; +if (*len < get_arglen[GET_CMDID (cmd)]) {pr_err ("get_ctl: len %u < %u\n" , *len, get_arglen[GET_CMDID (cmd)]);return -EINVAL ; } -if (copy_from_user (arg, user, get_arglen[GET_CMDID (cmd)]) !=0 ) + copylen = get_arglen[GET_CMDID (cmd)]; +if (copylen >128 ) +return -EINVAL ; + +if (copy_from_user (arg, user, copylen) !=0 )return -EFAULT ;if (mutex_lock_interruptible (&__ip_vs_mutex))
Signature · 7 lines
1.6.2.5 -- Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org
[cc: +Simon Horman]
Quoted 37 lines · Arjan van de Ven
From
761a182f96b3707e1fee44e1079ba227e48745d1Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <[email protected]>
Date: Wed, 30 Sep 2009 13:05:51 +0200
Subject: [PATCH] ipvs: Add boundary check on ioctl argumentsThe ipvs code has a nifty system for doing the size of ioctl command copies; it defines an array with values into which it indexes the cmd to find the right length.
Unfortunately, the ipvs code forgot to check if the cmd was in the range that the array provides, allowing for an index outside of the array, which then gives a "garbage" result into the length, which then gets used for copying into a stack buffer.
Fix this by adding sanity checks on these as well as the copy size.
Signed-off-by Arjan van de Ven <[email protected]>--- net/netfilter/ipvs/ip_vs_ctl.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)net/netfilter/ipvs/ip_vs_ctl.c +4
-0@@ -2077,6 +2077,10 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)if (!capable (CAP_NET_ADMIN ))return -EPERM ; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_SET_MAX +1 ) +return -EINVAL ; +if (len <0 || len >MAX_ARG_LEN ) +return -EINVAL ;if (len != set_arglen[SET_CMDID (cmd)]) {pr_err ("set_ctl: len %u != %u\n" , len, set_arglen[SET_CMDID (cmd)]);
net/netfilter/ipvs/ip_vs_ctl.c do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) · line 2358
Quoted 2 lines
net/netfilter/ipvs/ip_vs_ctl.c +0
-0@@ -2353,17 +2357,25 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) {unsigned char arg[128 ];
can MAX_ARG_LEN be used here?
Quoted 8 lines
net/netfilter/ipvs/ip_vs_ctl.c +3
-0int ret =0 ; +unsigned int copylen;if (!capable (CAP_NET_ADMIN ))return -EPERM ; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_GET_MAX +1 ) +return -EINVAL ;
net/netfilter/ipvs/ip_vs_ctl.c do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) · line 2375
Quoted 10 lines
net/netfilter/ipvs/ip_vs_ctl.c +3
-1+if (*len < get_arglen[GET_CMDID (cmd)]) {pr_err ("get_ctl: len %u < %u\n" , *len, get_arglen[GET_CMDID (cmd)]);return -EINVAL ; } -if (copy_from_user (arg, user, get_arglen[GET_CMDID (cmd)]) !=0 ) + copylen = get_arglen[GET_CMDID (cmd)]; +if (copylen >128 )
I think it's better to use 'copylen > sizeof(arg)' here.
Quoted 6 lines
net/netfilter/ipvs/ip_vs_ctl.c +3
-0+return -EINVAL ; + +if (copy_from_user (arg, user, copylen) !=0 )return -EFAULT ;if (mutex_lock_interruptible (&__ip_vs_mutex))
Quoted 7 lines · On Wed, 30 Sep 2009 15:38:12 +0200 Hannes Eder <[email protected]> wrote:
Quoted 2 lines
(quoted diff) +0
-0@@ -2353,17 +2357,25 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd,void
__user*user, int *len)
Quoted 2 lines
{
unsigned char arg[128];can
MAX_ARG_LENbe used here?
I am not convinced... it is a different numerical value, so it could be an ABI change. Rather not do that in this type of patch...
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ copylen = get_arglen[GET_CMDID(cmd)]; + if (copylen > 128)I think it's better to use 'copylen > sizeof(arg)' here.
fair enough; updated patch below
Quoted 1 line
From
28ae217858e683c0c94c02219d46a9a9c87f61c6Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <[email protected]>
Date: Wed, 30 Sep 2009 13:05:51 +0200
Subject: [PATCH] ipvs: Add boundary check on ioctl arguments
The ipvs code has a nifty system for doing the size of ioctl command copies; it defines an array with values into which it indexes the cmd to find the right length.
Unfortunately, the ipvs code forgot to check if the cmd was in the range that the array provides, allowing for an index outside of the array, which then gives a "garbage" result into the length, which then gets used for copying into a stack buffer.
Fix this by adding sanity checks on these as well as the copy size.
--- net/netfilter/ipvs/ip_vs_ctl.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +13 -1
@@ -2077,6 +2077,10 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)if (!capable (CAP_NET_ADMIN ))return -EPERM ; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_SET_MAX +1 ) +return -EINVAL ; +if (len <0 || len >sizeof (arg)) +return -EINVAL ;if (len != set_arglen[SET_CMDID (cmd)]) {pr_err ("set_ctl: len %u != %u\n" , len, set_arglen[SET_CMDID (cmd)]);
@@ -2353,17 +2357,25 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) {unsigned char arg[128 ];int ret =0 ; +unsigned int copylen;if (!capable (CAP_NET_ADMIN ))return -EPERM ; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_GET_MAX +1 ) +return -EINVAL ; +if (*len < get_arglen[GET_CMDID (cmd)]) {pr_err ("get_ctl: len %u < %u\n" , *len, get_arglen[GET_CMDID (cmd)]);return -EINVAL ; } -if (copy_from_user (arg, user, get_arglen[GET_CMDID (cmd)]) !=0 ) + copylen = get_arglen[GET_CMDID (cmd)]; +if (copylen >sizeof (arg)) +return -EINVAL ; + +if (copy_from_user (arg, user, copylen) !=0 )return -EFAULT ;if (mutex_lock_interruptible (&__ip_vs_mutex))
Signature · 8 lines
1.6.2.5 -- Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org
Quoted 8 lines · Arjan van de Ven
Quoted 6 lines · On Wed, 30 Sep 2009 15:38:12 +0200 Hannes Eder <[email protected]> wrote:
> @@ -2353,17 +2357,25 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, > void
__user
*user, int *len)
> {
> unsigned char arg[128];
Quoted 5 lines
Quoted 1 line
can
MAX_ARG_LENbe used here?I am not convinced... it is a different numerical value, so it could be an ABI change. Rather not do that in this type of patch...
For do_ip_vs_set_ctl MAX_ARG_LEN is used:
static intdo_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)
{
int ret;
unsigned char arg[MAX_ARG_LEN];...
I assume that will be fine for do_ip_vs_get_ctl as well.
-Hannes
Julian Anastasov
maintainerHello,
Quoted 7 lines · Arjan van de Ven
fair enough; updated patch below
Quoted 1 line
From
28ae217858e683c0c94c02219d46a9a9c87f61c6Mon Sep 17 00:00:00 2001From: Arjan van de Ven <[email protected]>
Date: Wed, 30 Sep 2009 13:05:51 +0200
Subject: [PATCH] ipvs: Add boundary check on ioctl arguments
Quoted 8 lines
The ipvs code has a nifty system for doing the size of ioctl command copies; it defines an array with values into which it indexes the cmd to find the right length.
Unfortunately, the ipvs code forgot to check if the cmd was in the range that the array provides, allowing for an index outside of the array, which then gives a "garbage" result into the length, which then gets used for copying into a stack buffer.
do_ip_vs_get_ctl and do_ip_vs_set_ctl are nf_sockopt_ops
handlers, so the range is checked by nf_sockopt_find() in Netfilter code. get_arglen[] and set_arglen[] are minimum values for the length and they can be 0. Later len can be checked additionally and surely can exceed 128 (include/linux/ip_vs.h has all user structures). Can you show the exact cmd and len used, may be there is error in some command or may be the provided user structure is wrong?
Regards
--
Julian Anastasov <[email protected]>
Quoted 5 lines · On Wed, 30 Sep 2009 22:41:05 +0300 (EEST) Julian Anastasov <[email protected]> wrote:
Hello,
On Wed, 30 Sep 2009, Arjan van de Ven wrote:
Quoted 7 lines
Quoted 1 line
fair enough; updated patch below
Later len can be checked
additionally and surely can exceed 128 (include/linux/ip_vs.hhas all user structures).
the on-stack structure currently is 128 bytes though...
Quoted 3 lines
Can you show the exact cmd and len
used, may be there is error in some command or may be the provided user structure is wrong?
this comes from code inspection using gcc features; this
is one of the (few) cases in the kernel where gcc cannot prove that the copy_from_user() length for the copy-to-stack is sufficiently bounds checked. I'm trying to make sure all these cases have complete enough checks, both for the obvious security reasons but also to be able to then make gcc emit a warning to prevent future issues from popping up.
Signature · 3 lines
Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org
Hello,
Quoted 1 line · Arjan van de Ven
fair enough; updated patch below
OK, you can add my signed-off line after changing
'cmd > ...MAX + 1' to 'cmd > ...MAX' at both places, nf_sockopt_ops ranges are [optmin ... optmax)
May be comments should be changed because:
- i'm not the author but after ispection we do not see any holes, we do not want users to upgrade just for this change
- the cmd checks are just to help code checking tools
- the len checks should help programmers (may be BUG_ON is better, user does not deserve EINVAL for wrong set_arglen/get_arglen). Checks for *len and len are not needed.
For example, for len checks this should be enough, beforecopy_from_user():
in do_ip_vs_get_ctl check can be
BUG_ON(get_arglen[GET_CMDID(cmd)] > sizeof(arg));
in do_ip_vs_set_ctl check can be
BUG_ON(set_arglen[SET_CMDID(cmd)] > sizeof(arg));
Quoted 53 lines
Quoted 1 line
From
28ae217858e683c0c94c02219d46a9a9c87f61c6Mon Sep 17 00:00:00 2001From: Arjan van de Ven <[email protected]>
Date: Wed, 30 Sep 2009 13:05:51 +0200
Subject: [PATCH] ipvs: Add boundary check on ioctl argumentsThe ipvs code has a nifty system for doing the size of ioctl command copies; it defines an array with values into which it indexes the cmd to find the right length.
Unfortunately, the ipvs code forgot to check if the cmd was in the range that the array provides, allowing for an index outside of the array, which then gives a "garbage" result into the length, which then gets used for copying into a stack buffer.
Fix this by adding sanity checks on these as well as the copy size.
Signed-off-by Arjan van de Ven <[email protected]>--- net/netfilter/ipvs/ip_vs_ctl.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)net/netfilter/ipvs/ip_vs_ctl.c +8
-0@@ -2077,6 +2077,10 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)if (!capable (CAP_NET_ADMIN ))return -EPERM ; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_SET_MAX +1 ) +return -EINVAL ; +if (len <0 || len >sizeof (arg)) +return -EINVAL ;if (len != set_arglen[SET_CMDID (cmd)]) {pr_err ("set_ctl: len %u != %u\n" , len, set_arglen[SET_CMDID (cmd)]);@@ -2353,17 +2357,25 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) {unsigned char arg[128 ];int ret =0 ; +unsigned int copylen;if (!capable (CAP_NET_ADMIN ))return -EPERM ; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_GET_MAX +1 ) +return -EINVAL ; +if (*len < get_arglen[GET_CMDID (cmd)]) {pr_err ("get_ctl: len %u < %u\n" , *len, get_arglen[GET_CMDID (cmd)]);return -EINVAL ; }
net/netfilter/ipvs/ip_vs_ctl.c do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) · line 2381
Quoted 10 lines
net/netfilter/ipvs/ip_vs_ctl.c +5
-1-if (copy_from_user (arg, user, get_arglen[GET_CMDID (cmd)]) !=0 ) + copylen = get_arglen[GET_CMDID (cmd)]; +if (copylen >sizeof (arg)) +return -EINVAL ; + +if (copy_from_user (arg, user, copylen) !=0 )return -EFAULT ;if (mutex_lock_interruptible (&__ip_vs_mutex))
Regards
--
Julian Anastasov <[email protected]>
On Wed, 30 Sep 2009 13:11:09 +0200
Arjan van de Ven <[email protected]> wrote:
ping on the patch below.... the warning is now triggered in mainline
Quoted 66 lines
Quoted 3 lines
From
761a182f96b3707e1fee44e1079ba227e48745d1Mon Sep 17 00:00:00 2001From: Arjan van de Ven <[email protected]>
Date: Wed, 30 Sep 2009 13:05:51 +0200
Subject: [PATCH] ipvs: Add boundary check on ioctl argumentsThe ipvs code has a nifty system for doing the size of ioctl command copies; it defines an array with values into which it indexes the cmd to find the right length.
Unfortunately, the ipvs code forgot to check if the cmd was in the range that the array provides, allowing for an index outside of the array, which then gives a "garbage" result into the length, which then gets used for copying into a stack buffer.
Fix this by adding sanity checks on these as well as the copy size.
Signed-off-by Arjan van de Ven <[email protected]>--- net/netfilter/ipvs/ip_vs_ctl.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)(quoted diff) +0
-0
b/net/netfilter/ipvs/ip_vs_ctl.cindex ac624e5..3c52796 100644net/netfilter/ipvs/ip_vs_ctl.c +13
-1@@ -2077,6 +2077,10 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) if (!capable(CAP_NET_ADMIN)) return -EPERM; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_SET_MAX +1 ) +return -EINVAL ; +if (len <0 || len >MAX_ARG_LEN ) +return -EINVAL ;if (len != set_arglen[SET_CMDID (cmd)]) {pr_err ("set_ctl: len %u != %u\n" , len, set_arglen[SET_CMDID (cmd)]);@@ -2353,17 +2357,25 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) { unsigned char arg[128];int ret =0 ; +unsigned int copylen;if (!capable (CAP_NET_ADMIN ))return -EPERM ; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_GET_MAX +1 ) +return -EINVAL ; +if (*len < get_arglen[GET_CMDID (cmd)]) {pr_err ("get_ctl: len %u < %u\n" , *len, get_arglen[GET_CMDID (cmd)]);return -EINVAL ; } -if (copy_from_user (arg, user, get_arglen[GET_CMDID (cmd)]) != 0) + copylen = get_arglen[GET_CMDID (cmd)]; +if (copylen >128 ) +return -EINVAL ; + +if (copy_from_user (arg, user, copylen) !=0 )return -EFAULT ;if (
mutex_lock_interruptible(&__ip_vs_mutex))
Signature · 3 lines
Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org
Quoted 4 lines · Arjan van de Ven
On Wed, 30 Sep 2009 13:11:09 +0200
Arjan van de Ven <[email protected]> wrote:ping on the patch below.... the warning is now triggered in mainline
Hi Arjan,
could you address the comments Julian made about this?
http://lkml.indiana.edu/hypermail/linux/kernel/0910.0/00852.html
OK, you can add my signed-off line after changing 'cmd > ...MAX + 1' to 'cmd > ...MAX' at both places, nf_sockopt_ops ranges are [optmin ... optmax)
May be comments should be changed because:
- i'm not the author but after ispection we do not see any holes, we do not want users to upgrade just for this change
- the cmd checks are just to help code checking tools
- the len checks should help programmers (may be BUG_ON is better, user does not deserve EINVAL for wrong set_arglen/get_arglen). Checks for *len and len are not needed.
For example, for len checks this should be enough, before copy_from_user():
in do_ip_vs_get_ctl check can be BUG_ON(get_arglen[GET_CMDID(cmd)] > sizeof(arg));
in do_ip_vs_set_ctl check can be BUG_ON(set_arglen[SET_CMDID(cmd)] > sizeof(arg));
Quoted 76 lines
Quoted 65 lines
Quoted 2 lines
From
761a182f96b3707e1fee44e1079ba227e48745d1Mon Sep 17 00:00:00 2001From: Arjan van de Ven <[email protected]>
Date: Wed, 30 Sep 2009 13:05:51 +0200
Subject: [PATCH] ipvs: Add boundary check on ioctl argumentsThe ipvs code has a nifty system for doing the size of ioctl command copies; it defines an array with values into which it indexes the cmd to find the right length.
Unfortunately, the ipvs code forgot to check if the cmd was in the range that the array provides, allowing for an index outside of the array, which then gives a "garbage" result into the length, which then gets used for copying into a stack buffer.
Fix this by adding sanity checks on these as well as the copy size.
Signed-off-by Arjan van de Ven <[email protected]>--- net/netfilter/ipvs/ip_vs_ctl.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)(quoted diff) +0
-0
b/net/netfilter/ipvs/ip_vs_ctl.cindex ac624e5..3c52796 100644net/netfilter/ipvs/ip_vs_ctl.c +13
-1@@ -2077,6 +2077,10 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) if (!capable(CAP_NET_ADMIN)) return -EPERM; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_SET_MAX +1 ) +return -EINVAL ; +if (len <0 || len >MAX_ARG_LEN ) +return -EINVAL ;if (len != set_arglen[SET_CMDID (cmd)]) {pr_err ("set_ctl: len %u != %u\n" , len, set_arglen[SET_CMDID (cmd)]);@@ -2353,17 +2357,25 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) { unsigned char arg[128];int ret =0 ; +unsigned int copylen;if (!capable (CAP_NET_ADMIN ))return -EPERM ; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_GET_MAX +1 ) +return -EINVAL ; +if (*len < get_arglen[GET_CMDID (cmd)]) {pr_err ("get_ctl: len %u < %u\n" , *len, get_arglen[GET_CMDID (cmd)]);return -EINVAL ; } -if (copy_from_user (arg, user, get_arglen[GET_CMDID (cmd)]) != 0) + copylen = get_arglen[GET_CMDID (cmd)]; +if (copylen >128 ) +return -EINVAL ; + +if (copy_from_user (arg, user, copylen) !=0 )return -EFAULT ;if (
mutex_lock_interruptible(&__ip_vs_mutex))Signature · 8 lines
Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Simon Horman
maintainerQuoted 27 lines · Simon Horman
Quoted 4 lines · Arjan van de Ven
On Wed, 30 Sep 2009 13:11:09 +0200
Arjan van de Ven <[email protected]> wrote:ping on the patch below.... the warning is now triggered in mainline
Hi Arjan,
could you address the comments Julian made about this?
http://lkml.indiana.edu/hypermail/linux/kernel/0910.0/00852.htmlOK, you can add my signed-off line after changing 'cmd > ...MAX + 1' to 'cmd > ...MAX' at both places,
nf_sockopt_opsranges are [optmin ... optmax)May be comments should be changed because:
- i'm not the author but after ispection we do not see any holes, we do not want users to upgrade just for this change
- the cmd checks are just to help code checking tools
- the len checks should help programmers (may beBUG_ONis better, user does not deserve EINVAL for wrong set_arglen/get_arglen). Checks for *len and len are not needed.For example, for len checks this should be enough, before
copy_from_user():
Quoted 7 lines
in
do_ip_vs_get_ctlcheck can beBUG_ON(get_arglen[GET_CMDID(cmd)] > sizeof(arg));in
do_ip_vs_set_ctlcheck can beBUG_ON(set_arglen[SET_CMDID(cmd)] > sizeof(arg));Acked-by Julian Anastasov <[email protected]>
Ping.
While I agree with Julian that the patch you suggest below ought not to be necessary, I'm also happy with it if cmd > IP_VS_SO_SET_MAX + 1 is changed to cmd > IP_VS_SO_SET_MAX.
Quoted 81 lines
Quoted 64 lines
Quoted 64 lines
Quoted 2 lines
From
761a182f96b3707e1fee44e1079ba227e48745d1Mon Sep 17 00:00:00 2001From: Arjan van de Ven <[email protected]>
Date: Wed, 30 Sep 2009 13:05:51 +0200
Subject: [PATCH] ipvs: Add boundary check on ioctl argumentsThe ipvs code has a nifty system for doing the size of ioctl command copies; it defines an array with values into which it indexes the cmd to find the right length.
Unfortunately, the ipvs code forgot to check if the cmd was in the range that the array provides, allowing for an index outside of the array, which then gives a "garbage" result into the length, which then gets used for copying into a stack buffer.
Fix this by adding sanity checks on these as well as the copy size.
Signed-off-by Arjan van de Ven <[email protected]>--- net/netfilter/ipvs/ip_vs_ctl.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)(quoted diff) +0
-0
b/net/netfilter/ipvs/ip_vs_ctl.cindex ac624e5..3c52796 100644net/netfilter/ipvs/ip_vs_ctl.c +13
-1@@ -2077,6 +2077,10 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) if (!capable(CAP_NET_ADMIN)) return -EPERM; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_SET_MAX +1 ) +return -EINVAL ; +if (len <0 || len >MAX_ARG_LEN ) +return -EINVAL ;if (len != set_arglen[SET_CMDID (cmd)]) {pr_err ("set_ctl: len %u != %u\n" , len, set_arglen[SET_CMDID (cmd)]);@@ -2353,17 +2357,25 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) { unsigned char arg[128];int ret =0 ; +unsigned int copylen;if (!capable (CAP_NET_ADMIN ))return -EPERM ; +if (cmd <IP_VS_BASE_CTL || cmd >IP_VS_SO_GET_MAX +1 ) +return -EINVAL ; +if (*len < get_arglen[GET_CMDID (cmd)]) {pr_err ("get_ctl: len %u < %u\n" , *len, get_arglen[GET_CMDID (cmd)]);return -EINVAL ; } -if (copy_from_user (arg, user, get_arglen[GET_CMDID (cmd)]) != 0) + copylen = get_arglen[GET_CMDID (cmd)]; +if (copylen >128 ) +return -EINVAL ; + +if (copy_from_user (arg, user, copylen) !=0 )return -EFAULT ;Quoted 12 lines
Quoted 1 line
if (
mutex_lock_interruptible(&__ip_vs_mutex))Signature · 8 lines
Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/