Skip to content

Commit

Permalink
TTY: snyclinkmp: forever loop in tx_load_dma_buffer()
Browse files Browse the repository at this point in the history
My main concern here was the line that said:
	copy_count = min_t(unsigned short,count,SCABUFSIZE);
"count" is an unsigned int here so the cast to unsigned short
truncates the upper bits.  So if count is 0x10000 then copy_count is
0 and the loop never exits.

"count" comes from skb->len in hdlcdev_xmit().

The other min_t() changes are just cleanups.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Sep 29, 2011
1 parent 268e526 commit 53d785c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/tty/synclinkmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -4950,7 +4950,7 @@ static bool rx_get_frame(SLMP_INFO *info)

if ( debug_level >= DEBUG_LEVEL_DATA )
trace_block(info,info->rx_buf_list_ex[StartIndex].virt_addr,
min_t(int, framesize,SCABUFSIZE),0);
min_t(unsigned int, framesize, SCABUFSIZE), 0);

if (framesize) {
if (framesize > info->max_frame_size)
Expand Down Expand Up @@ -5015,14 +5015,14 @@ static void tx_load_dma_buffer(SLMP_INFO *info, const char *buf, unsigned int co
SCADESC_EX *desc_ex;

if ( debug_level >= DEBUG_LEVEL_DATA )
trace_block(info,buf, min_t(int, count,SCABUFSIZE), 1);
trace_block(info, buf, min_t(unsigned int, count, SCABUFSIZE), 1);

/* Copy source buffer to one or more DMA buffers, starting with
* the first transmit dma buffer.
*/
for(i=0;;)
{
copy_count = min_t(unsigned short,count,SCABUFSIZE);
copy_count = min_t(unsigned int, count, SCABUFSIZE);

desc = &info->tx_buf_list[i];
desc_ex = &info->tx_buf_list_ex[i];
Expand Down

0 comments on commit 53d785c

Please sign in to comment.