]> git.baikalelectronics.ru Git - kernel.git/commit
can: gw: ensure DLC boundaries after CAN frame modification
authorOliver Hartkopp <socketcan@hartkopp.net>
Fri, 4 Jan 2019 14:55:26 +0000 (15:55 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Jan 2019 13:17:51 +0000 (05:17 -0800)
commit01f5df9fe920e0c0d3cf8777cfd48ad774e1028c
treea5da4e891cc8ce02bf185ff30437297978b9eacf
parent1e85ad46708be81a4168ad70ddeb2fdd7bc4d63c
can: gw: ensure DLC boundaries after CAN frame modification

Muyu Yu provided a POC where user root with CAP_NET_ADMIN can create a CAN
frame modification rule that makes the data length code a higher value than
the available CAN frame data size. In combination with a configured checksum
calculation where the result is stored relatively to the end of the data
(e.g. cgw_csum_xor_rel) the tail of the skb (e.g. frag_list pointer in
skb_shared_info) can be rewritten which finally can cause a system crash.

Michael Kubecek suggested to drop frames that have a DLC exceeding the
available space after the modification process and provided a patch that can
handle CAN FD frames too. Within this patch we also limit the length for the
checksum calculations to the maximum of Classic CAN data length (8).

CAN frames that are dropped by these additional checks are counted with the
CGW_DELETED counter which indicates misconfigurations in can-gw rules.

This fixes CVE-2019-3701.

Reported-by: Muyu Yu <ieatmuttonchuan@gmail.com>
Reported-by: Marcus Meissner <meissner@suse.de>
Suggested-by: Michal Kubecek <mkubecek@suse.cz>
Tested-by: Muyu Yu <ieatmuttonchuan@gmail.com>
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: linux-stable <stable@vger.kernel.org> # >= v3.2
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/can/gw.c