net: clear heap allocations for privileged ethtool actions
Subsystems (2)
PATCH 1/1 net: clear heap allocations for privileged ethtool actions
Several other ethtool functions leave heap uncleared (potentially) by drivers. Some interfaces appear safe (eeprom, etc), in that the sizes are well controlled. In some situations (e.g. unchecked error conditions), the heap will remain unchanged in areas before copying back to userspace. Note that these are less of an issue since these all require CAP_NET_ADMIN.
--- net/core/ethtool.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
net/core/ethtool.c +3 -3
@@ -397,7 +397,7 @@ static noinline_for_stack int ethtool_get_rxfh_indir(struct net_device *dev, (KMALLOC_MAX_SIZE - sizeof(*indir)) / sizeof(*indir->ring_index))return -ENOMEM ; full_size =sizeof (*indir) +sizeof (*indir->ring_index) * table_size; - indir =kmalloc (full_size,GFP_USER ); + indir =kzalloc (full_size,GFP_USER );if (!indir)return -ENOMEM ;
@@ -538,7 +538,7 @@ static int ethtool_get_rx_ntuple(struct net_device *dev, void __user *useraddr) gstrings.len = ret; - data =kmalloc (gstrings.len *ETH_GSTRING_LEN ,GFP_USER ); + data =kzalloc (gstrings.len *ETH_GSTRING_LEN ,GFP_USER );if (!data)return -ENOMEM ;
@@ -775,7 +775,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)if (regs.len > reglen) regs.len = reglen; - regbuf =kmalloc (reglen,GFP_USER ); + regbuf =kzalloc (reglen,GFP_USER );if (!regbuf)return -ENOMEM ;
Signature · 5 lines
1.7.1 -- Kees Cook Ubuntu Security Team
Quoted 18 lines · Kees Cook
Several other ethtool functions leave heap uncleared (potentially) by drivers. Some interfaces appear safe (eeprom, etc), in that the sizes are well controlled. In some situations (e.g. unchecked error conditions), the heap will remain unchanged in areas before copying back to userspace. Note that these are less of an issue since these all require
CAP_NET_ADMIN.net/core/ethtool.c +1
-1@@ -775,7 +775,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)if (regs.len > reglen) regs.len = reglen; - regbuf =kmalloc (reglen,GFP_USER ); + regbuf =kzalloc (reglen,GFP_USER );if (!regbuf)return -ENOMEM ;Signature · 1 line
1.7.1
Are you sure this is not hiding a more problematic problem ?
Code does :
reglen = ops->get_regs_len(dev);
if (regs.len > reglen)
regs.len = reglen;
regbuf = kmalloc(reglen, GFP_USER);
So we can not copy back kernel memory.
However, what happens if user provides regs.len = 1 byte, and driver get_regs() doesnt properly checks regs.len and write past end of regbuf -> We probably write on other parts of kernel memory
An audit is needed, but first driver I checked is buggy (drivers/net/qlcnic/qlcnic_ethtool.c)
->
memset(p, 0, qlcnic_get_regs_len(dev));
Quoted 7 lines · Eric Dumazet
Quoted 5 lines · Kees Cook
Several other ethtool functions leave heap uncleared (potentially) by drivers. Some interfaces appear safe (eeprom, etc), in that the sizes are well controlled. In some situations (e.g. unchecked error conditions), the heap will remain unchanged in areas before copying back to userspace. Note that these are less of an issue since these all require
CAP_NET_ADMIN.
Quoted 6 lines
net/core/ethtool.c static int ethtool_get_regs(struct net_device *dev, char __user *useraddr) · line 778
Quoted 6 lines
net/core/ethtool.c +1
-1@@ -775,7 +775,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)if (regs.len > reglen) regs.len = reglen; - regbuf =kmalloc (reglen,GFP_USER ); + regbuf =kzalloc (reglen,GFP_USER );
Actually, I recently changed this to vmalloc() so your patch won't apply.
Quoted 13 lines
Quoted 6 lines
net/core/ethtool.c +0
-0if (!regbuf)return -ENOMEM ;Signature · 1 line
1.7.1Are you sure this is not hiding a more problematic problem ?
Code does :
reglen =
ops->get_regs_len(dev);
if (regs.len > reglen)
Quoted 8 lines
regs.len = reglen;regbuf =
kmalloc(reglen, GFP_USER);So we can not copy back kernel memory.
However, what happens if user provides regs.len = 1 byte, and driver
get_regs()doesnt properly checks regs.len and write past end of regbuf -> We probably write on other parts of kernel memory
[...]
Why should the driver's get_regs() check regs.len? The buffer is allocated based on reglen which is provided by the driver, not the user.
reglen (length of the kernel buffer) is not reduced; regs.len (length of the user buffer) is. That lets the user know how much of the user buffer was actually used.
Ben.
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
Hi Eric,
Quoted 26 lines · Eric Dumazet
Quoted 18 lines · Kees Cook
Several other ethtool functions leave heap uncleared (potentially) by drivers. Some interfaces appear safe (eeprom, etc), in that the sizes are well controlled. In some situations (e.g. unchecked error conditions), the heap will remain unchanged in areas before copying back to userspace. Note that these are less of an issue since these all require
CAP_NET_ADMIN.net/core/ethtool.c +1
-1@@ -775,7 +775,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)if (regs.len > reglen) regs.len = reglen; - regbuf =kmalloc (reglen,GFP_USER ); + regbuf =kzalloc (reglen,GFP_USER );if (!regbuf)return -ENOMEM ;Signature · 1 line
1.7.1Are you sure this is not hiding a more problematic problem ?
Code does :
reglen =
ops->get_regs_len(dev);
if (regs.len > reglen)
Quoted 8 lines
regs.len = reglen;regbuf =
kmalloc(reglen, GFP_USER);So we can not copy back kernel memory.
However, what happens if user provides regs.len = 1 byte, and driver
get_regs()doesnt properly checks regs.len and write past end of regbuf -> We probably write on other parts of kernel memory
This code is basically a max() call from what I see.
regbuf = kmalloc(max(regs.len, ops->get_regs_len(dev)), GFP_USER);
If the user passes regs.len = 1, it will be ignored in favor of reglen, so we'll not write past the end of regbuf, unless I'm misunderstanding.
-Kees
Signature · 2 lines
Kees Cook Ubuntu Security Team
Quoted 25 lines · Kees Cook
Several other ethtool functions leave heap uncleared (potentially) by drivers. Some interfaces appear safe (eeprom, etc), in that the sizes are well controlled. In some situations (e.g. unchecked error conditions), the heap will remain unchanged in areas before copying back to userspace. Note that these are less of an issue since these all require
CAP_NET_ADMIN.Signed-off-by Kees Cook <[email protected]>--- net/core/ethtool.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)net/core/ethtool.c +1
-1@@ -397,7 +397,7 @@ static noinline_for_stack int ethtool_get_rxfh_indir(struct net_device *dev, (KMALLOC_MAX_SIZE - sizeof(*indir)) / sizeof(*indir->ring_index))return -ENOMEM ; full_size =sizeof (*indir) +sizeof (*indir->ring_index) * table_size; - indir =kmalloc (full_size,GFP_USER ); + indir =kzalloc (full_size,GFP_USER );if (!indir)return -ENOMEM ;
[...]
You could alternately recalculate full_size before copying back to the user buffer:
full_size = sizeof(*indir) + sizeof(*indir->ring_index) * indir->size;
but kzalloc() is more obviously safe.
Ben.
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
David Miller
maintainerFrom: Ben Hutchings <[email protected]>
Date: Thu, 07 Oct 2010 22:34:44 +0100
Quoted 9 lines · Kees Cook
Quoted 8 lines
Several other ethtool functions leave heap uncleared (potentially) by drivers. Some interfaces appear safe (eeprom, etc), in that the sizes are well controlled. In some situations (e.g. unchecked error conditions), the heap will remain unchanged in areas before copying back to userspace. Note that these are less of an issue since these all require
CAP_NET_ADMIN.Signed-off-by Kees Cook <[email protected]>
...
Quoted 1 line
Acked-by Ben Hutchings <[email protected]>
So I've applied Kees's patch to net-2.6, and I'll merge net-2.6 into net-next-2.6 so I can resolve the vmalloc/kzalloc merge conflict before Stephen Rothwell and others have to deal with it in -next.
Thanks!