mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 14:14:37 +00:00
Code Issues Releases Wiki Activity

Staging: hv: don't use dynamic sized array

Browse source 
NetVscOnChannelCallback() used a dynamic sized array that also made
the frame size over 2048.  Replace it with a buffer allocated from
kzalloc.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bill Pemberton 2010-04-27 16:23:47 -04:00 committed by Greg Kroah-Hartman
parent a5729c005c
commit c6fcf0baa6
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/staging/hv/NetVsc.c
View file

@ -1288,28 +1288,33 @@ static void NetVscOnReceiveCompletion(void *Context)
void NetVscOnChannelCallback(void *Context) void NetVscOnChannelCallback(void *Context)
{ {
const int netPacketSize = 2048;
int ret; int ret;
struct hv_device *device = Context; struct hv_device *device = Context;
struct netvsc_device *netDevice; struct netvsc_device *netDevice;
u32 bytesRecvd; u32 bytesRecvd;
u64 requestId; u64 requestId;
unsigned char packet[netPacketSize]; unsigned char *packet;
struct vmpacket_descriptor *desc; struct vmpacket_descriptor *desc;
unsigned char *buffer = packet; unsigned char *buffer;
int bufferlen = netPacketSize; int bufferlen = NETVSC_PACKET_SIZE;
DPRINT_ENTER(NETVSC); DPRINT_ENTER(NETVSC);
ASSERT(device); ASSERT(device);
packet = kzalloc(NETVSC_PACKET_SIZE * sizeof(unsigned char),
GFP_KERNEL);
if (!packet)
return;
buffer = packet;
netDevice = GetInboundNetDevice(device); netDevice = GetInboundNetDevice(device);
if (!netDevice) { if (!netDevice) {
DPRINT_ERR(NETVSC, "net device (%p) shutting down..." DPRINT_ERR(NETVSC, "net device (%p) shutting down..."
"ignoring inbound packets", netDevice); "ignoring inbound packets", netDevice);
DPRINT_EXIT(NETVSC); DPRINT_EXIT(NETVSC);
return; goto out;
} }
do { do {
@ -1341,17 +1346,17 @@ void NetVscOnChannelCallback(void *Context)
} }
/* reset */ /* reset */
if (bufferlen > netPacketSize) { if (bufferlen > NETVSC_PACKET_SIZE) {
kfree(buffer); kfree(buffer);
buffer = packet; buffer = packet;
bufferlen = netPacketSize; bufferlen = NETVSC_PACKET_SIZE;
} }
} else { } else {
/* reset */ /* reset */
if (bufferlen > netPacketSize) { if (bufferlen > NETVSC_PACKET_SIZE) {
kfree(buffer); kfree(buffer);
buffer = packet; buffer = packet;
bufferlen = netPacketSize; bufferlen = NETVSC_PACKET_SIZE;
} }
break; break;
@ -1375,5 +1380,7 @@ void NetVscOnChannelCallback(void *Context)
PutNetDevice(device); PutNetDevice(device);
DPRINT_EXIT(NETVSC); DPRINT_EXIT(NETVSC);
out:
kfree(buffer);
return; return;
} }

1
drivers/staging/hv/NetVsc.h
View file

@ -289,6 +289,7 @@ struct nvsp_message {
/* Preallocated receive packets */ /* Preallocated receive packets */
#define NETVSC_RECEIVE_PACKETLIST_COUNT 256 #define NETVSC_RECEIVE_PACKETLIST_COUNT 256
#define NETVSC_PACKET_SIZE 2048
/* Per netvsc channel-specific */ /* Per netvsc channel-specific */
struct netvsc_device { struct netvsc_device {