In the first alteration, the MAX_CNTL_PKT_SIZE is the maximum size of the control packet in ->Adapter->txctlpacket[] which is defined in InitAdapter(). This caps the size of kmalloc memory allocation. In the second change, this max cap fixes a potential memory corruption bug when subsequent memset and memcpy calls are invoked. Signed-off-by: Kevin McKinney <klmckinney1@xxxxxxxxx> --- drivers/staging/bcm/Bcmchar.c | 3 +++ drivers/staging/bcm/Misc.c | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index 1905a83..4c43353 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -690,6 +690,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) if (IoBuffer.InputLength < sizeof(struct link_request)) return -EINVAL; + if (IoBuffer.InputLength > MAX_CNTL_PKT_SIZE) + return -EINVAL; + pvBuffer = kmalloc(IoBuffer.InputLength, GFP_KERNEL); if (!pvBuffer) return -ENOMEM; diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c index c5b3a36..9da9408 100644 --- a/drivers/staging/bcm/Misc.c +++ b/drivers/staging/bcm/Misc.c @@ -421,6 +421,10 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter,/**<Logical Adapter*/ pLeader->PLength = pktlen; } } + + if (pktlen + LEADER_SIZE > MAX_CNTL_PKT_SIZE) + return -EINVAL; + memset(ctrl_buff, 0, pktlen+LEADER_SIZE); BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Copying the Control Packet Buffer with length=%d\n", pLeader->PLength); *(PLEADER)ctrl_buff=*pLeader; -- 1.7.4.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
