From 3de28454601fd1776203547b34961c38462ddfd5 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 21 Jul 2011 15:25:30 -0700 Subject: [PATCH] --- yaml --- r: 256595 b: refs/heads/master c: 67ae7cf1eeda777f79259c4c6cb17a0bd28dee71 h: refs/heads/master i: 256593: bed14a87332e9689087cf352b158a76a428d891e 256591: 73eedcfe84518eab22f4f85ad83fdc1434ca2939 v: v3 --- [refs] | 2 +- trunk/net/core/ethtool.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c8c5a86e8c8d..8148da17e70a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1511022c9aabf253253e35730a6a3b945a2a53a9 +refs/heads/master: 67ae7cf1eeda777f79259c4c6cb17a0bd28dee71 diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c index b7c12a63d0ce..6cdba5fc2bed 100644 --- a/trunk/net/core/ethtool.c +++ b/trunk/net/core/ethtool.c @@ -923,7 +923,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr) regs.len = reglen; regbuf = vzalloc(reglen); - if (!regbuf) + if (reglen && !regbuf) return -ENOMEM; ops->get_regs(dev, ®s, regbuf); @@ -932,7 +932,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr) if (copy_to_user(useraddr, ®s, sizeof(regs))) goto out; useraddr += offsetof(struct ethtool_regs, data); - if (copy_to_user(useraddr, regbuf, regs.len)) + if (regbuf && copy_to_user(useraddr, regbuf, regs.len)) goto out; ret = 0;