Revision 07718be265680dcf496347d475ce1a5442f55ad7 authored by Maxim Mikityanskiy on 10 June 2021, 16:40:30 UTC, committed by David S. Miller on 10 June 2021, 21:26:18 UTC
The TCP option parser in mptcp (mptcp_get_options) could read one byte
out of bounds. When the length is 1, the execution flow gets into the
loop, reads one byte of the opcode, and if the opcode is neither
TCPOPT_EOL nor TCPOPT_NOP, it reads one more byte, which exceeds the
length of 1.
This fix is inspired by commit 9609dad263f8 ("ipv4: tcp_input: fix stack
out of bounds when parsing TCP options.").
Cc: Young Xiao <92siuyang@gmail.com>
Fixes: cec37a6e41aa ("mptcp: Handle MP_CAPABLE options for outgoing connections")
Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 5fc177a
| File | Mode | Size |
|---|---|---|
| partitions | ||
| Kconfig | -rw-r--r-- | 6.7 KB |
| Kconfig.iosched | -rw-r--r-- | 1.3 KB |
| Makefile | -rw-r--r-- | 1.7 KB |
| badblocks.c | -rw-r--r-- | 14.1 KB |
| bfq-cgroup.c | -rw-r--r-- | 38.5 KB |
| bfq-iosched.c | -rw-r--r-- | 254.1 KB |
| bfq-iosched.h | -rw-r--r-- | 37.5 KB |
| bfq-wf2q.c | -rw-r--r-- | 52.7 KB |
| bio-integrity.c | -rw-r--r-- | 12.5 KB |
| bio.c | -rw-r--r-- | 43.9 KB |
| blk-cgroup-rwstat.c | -rw-r--r-- | 3.4 KB |
| blk-cgroup-rwstat.h | -rw-r--r-- | 3.9 KB |
| blk-cgroup.c | -rw-r--r-- | 50.4 KB |
| blk-core.c | -rw-r--r-- | 47.8 KB |
| blk-crypto-fallback.c | -rw-r--r-- | 18.5 KB |
| blk-crypto-internal.h | -rw-r--r-- | 5.4 KB |
| blk-crypto.c | -rw-r--r-- | 12.0 KB |
| blk-exec.c | -rw-r--r-- | 2.5 KB |
| blk-flush.c | -rw-r--r-- | 15.0 KB |
| blk-integrity.c | -rw-r--r-- | 11.8 KB |
| blk-ioc.c | -rw-r--r-- | 10.1 KB |
| blk-iocost.c | -rw-r--r-- | 96.4 KB |
| blk-iolatency.c | -rw-r--r-- | 28.0 KB |
| blk-lib.c | -rw-r--r-- | 11.4 KB |
| blk-map.c | -rw-r--r-- | 14.2 KB |
| blk-merge.c | -rw-r--r-- | 30.5 KB |
| blk-mq-cpumap.c | -rw-r--r-- | 2.2 KB |
| blk-mq-debugfs-zoned.c | -rw-r--r-- | 435 bytes |
| blk-mq-debugfs.c | -rw-r--r-- | 24.6 KB |
| blk-mq-debugfs.h | -rw-r--r-- | 2.7 KB |
| blk-mq-pci.c | -rw-r--r-- | 1.3 KB |
| blk-mq-rdma.c | -rw-r--r-- | 1.3 KB |
| blk-mq-sched.c | -rw-r--r-- | 17.1 KB |
| blk-mq-sched.h | -rw-r--r-- | 2.4 KB |
| blk-mq-sysfs.c | -rw-r--r-- | 8.3 KB |
| blk-mq-tag.c | -rw-r--r-- | 17.0 KB |
| blk-mq-tag.h | -rw-r--r-- | 2.3 KB |
| blk-mq-virtio.c | -rw-r--r-- | 1.3 KB |
| blk-mq.c | -rw-r--r-- | 98.2 KB |
| blk-mq.h | -rw-r--r-- | 9.8 KB |
| blk-pm.c | -rw-r--r-- | 6.8 KB |
| blk-pm.h | -rw-r--r-- | 763 bytes |
| blk-rq-qos.c | -rw-r--r-- | 7.1 KB |
| blk-rq-qos.h | -rw-r--r-- | 5.0 KB |
| blk-settings.c | -rw-r--r-- | 28.4 KB |
| blk-stat.c | -rw-r--r-- | 4.8 KB |
| blk-stat.h | -rw-r--r-- | 4.6 KB |
| blk-sysfs.c | -rw-r--r-- | 24.9 KB |
| blk-throttle.c | -rw-r--r-- | 67.7 KB |
| blk-timeout.c | -rw-r--r-- | 4.1 KB |
| blk-wbt.c | -rw-r--r-- | 19.8 KB |
| blk-wbt.h | -rw-r--r-- | 2.8 KB |
| blk-zoned.c | -rw-r--r-- | 15.6 KB |
| blk.h | -rw-r--r-- | 11.3 KB |
| bounce.c | -rw-r--r-- | 7.1 KB |
| bsg-lib.c | -rw-r--r-- | 9.9 KB |
| bsg.c | -rw-r--r-- | 11.1 KB |
| cmdline-parser.c | -rw-r--r-- | 4.9 KB |
| elevator.c | -rw-r--r-- | 18.5 KB |
| genhd.c | -rw-r--r-- | 46.2 KB |
| ioctl.c | -rw-r--r-- | 15.7 KB |
| ioprio.c | -rw-r--r-- | 5.2 KB |
| keyslot-manager.c | -rw-r--r-- | 16.3 KB |
| kyber-iosched.c | -rw-r--r-- | 27.8 KB |
| mq-deadline.c | -rw-r--r-- | 20.5 KB |
| opal_proto.h | -rw-r--r-- | 9.4 KB |
| scsi_ioctl.c | -rw-r--r-- | 22.4 KB |
| sed-opal.c | -rw-r--r-- | 62.5 KB |
| t10-pi.c | -rw-r--r-- | 7.8 KB |
Computing file changes ...
