net: clear heap allocation for ethtool_get_regs() · b7c7d01aae - Gogs

net: clear heap allocation for ethtool_get_regs()

There is a conflict between commit b00916b1 and a77f5db3. This patch resolves
the conflict by clearing the heap allocation in ethtool_get_regs().

Cc: stable@kernel.org
Signed-off-by: Eugene Teo <eugeneteo@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Eugene Teo 14 years ago

parent

d80bc0fd26

commit

b7c7d01aae

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
net/core/ethtool.c
							 
								View File
							
				@@ -817,7 +817,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)
			
				 	if (regs.len > reglen)
			
				 		regs.len = reglen;
			
				-	regbuf = vmalloc(reglen);
			
				+	regbuf = vzalloc(reglen);
			
				 	if (!regbuf)
			
				 		return -ENOMEM;