Skip to content

Commit 2b04495

Browse files
Xu Jiadavem330
Xu Jia
authored andcommitted
hamradio: 6pack: fix array-index-out-of-bounds in decode_std_command()
Hulk Robot reports incorrect sp->rx_count_cooked value in decode_std_command(). This should be caused by the subtracting from sp->rx_count_cooked before. It seems that sp->rx_count_cooked value is changed to 0, which bypassed the previous judgment. The situation is shown below: (Thread 1) | (Thread 2) decode_std_command() | resync_tnc() ... | if (rest == 2) | sp->rx_count_cooked -= 2; | else if (rest == 3) | ... | sp->rx_count_cooked = 0; sp->rx_count_cooked -= 1; | for (i = 0; i < sp->rx_count_cooked; i++) // report error checksum += sp->cooked_buf[i]; sp->rx_count_cooked is a shared variable but is not protected by a lock. The same applies to sp->rx_count. This patch adds a lock to fix the bug. The fail log is shown below: ======================================================================= UBSAN: array-index-out-of-bounds in drivers/net/hamradio/6pack.c:925:31 index 400 is out of range for type 'unsigned char [400]' CPU: 3 PID: 7433 Comm: kworker/u10:1 Not tainted 5.18.0-rc5-00163-g4b97bac0756a #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 Workqueue: events_unbound flush_to_ldisc Call Trace: <TASK> dump_stack_lvl+0xcd/0x134 ubsan_epilogue+0xb/0x50 __ubsan_handle_out_of_bounds.cold+0x62/0x6c sixpack_receive_buf+0xfda/0x1330 tty_ldisc_receive_buf+0x13e/0x180 tty_port_default_receive_buf+0x6d/0xa0 flush_to_ldisc+0x213/0x3f0 process_one_work+0x98f/0x1620 worker_thread+0x665/0x1080 kthread+0x2e9/0x3a0 ret_from_fork+0x1f/0x30 ... Reported-by: Hulk Robot <[email protected]> Signed-off-by: Xu Jia <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 911600b commit 2b04495

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

drivers/net/hamradio/6pack.c

+8-1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ struct sixpack {
9999

100100
unsigned int rx_count;
101101
unsigned int rx_count_cooked;
102+
spinlock_t rxlock;
102103

103104
int mtu; /* Our mtu (to spot changes!) */
104105
int buffsize; /* Max buffers sizes */
@@ -565,6 +566,7 @@ static int sixpack_open(struct tty_struct *tty)
565566
sp->dev = dev;
566567

567568
spin_lock_init(&sp->lock);
569+
spin_lock_init(&sp->rxlock);
568570
refcount_set(&sp->refcnt, 1);
569571
init_completion(&sp->dead);
570572

@@ -913,6 +915,7 @@ static void decode_std_command(struct sixpack *sp, unsigned char cmd)
913915
sp->led_state = 0x60;
914916
/* fill trailing bytes with zeroes */
915917
sp->tty->ops->write(sp->tty, &sp->led_state, 1);
918+
spin_lock_bh(&sp->rxlock);
916919
rest = sp->rx_count;
917920
if (rest != 0)
918921
for (i = rest; i <= 3; i++)
@@ -930,6 +933,7 @@ static void decode_std_command(struct sixpack *sp, unsigned char cmd)
930933
sp_bump(sp, 0);
931934
}
932935
sp->rx_count_cooked = 0;
936+
spin_unlock_bh(&sp->rxlock);
933937
}
934938
break;
935939
case SIXP_TX_URUN: printk(KERN_DEBUG "6pack: TX underrun\n");
@@ -959,8 +963,11 @@ sixpack_decode(struct sixpack *sp, const unsigned char *pre_rbuff, int count)
959963
decode_prio_command(sp, inbyte);
960964
else if ((inbyte & SIXP_STD_CMD_MASK) != 0)
961965
decode_std_command(sp, inbyte);
962-
else if ((sp->status & SIXP_RX_DCD_MASK) == SIXP_RX_DCD_MASK)
966+
else if ((sp->status & SIXP_RX_DCD_MASK) == SIXP_RX_DCD_MASK) {
967+
spin_lock_bh(&sp->rxlock);
963968
decode_data(sp, inbyte);
969+
spin_unlock_bh(&sp->rxlock);
970+
}
964971
}
965972
}
966973

0 commit comments

Comments
 (0)