summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsantosh.shilimkar@oracle.com <santosh.shilimkar@oracle.com>2017-01-06 19:44:15 +0100
committerDavid S. Miller <davem@davemloft.net>2017-01-07 04:14:26 +0100
commit780e982905bef61d13496d9af5310bf4af3a64d3 (patch)
treebc67c33913e700fce2c8d1e6288be81ea5b5b364
parentMerge tag 'rxrpc-rewrite-20170106' of git://git.kernel.org/pub/scm/linux/kern... (diff)
downloadlinux-780e982905bef61d13496d9af5310bf4af3a64d3.tar.xz
linux-780e982905bef61d13496d9af5310bf4af3a64d3.zip
RDS: validate the requested traces user input against max supported
Larger than supported value can lead to array read/write overflow. Reported-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/rds/af_rds.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
index fd8217404162..b405f77d664c 100644
--- a/net/rds/af_rds.c
+++ b/net/rds/af_rds.c
@@ -310,6 +310,9 @@ static int rds_recv_track_latency(struct rds_sock *rs, char __user *optval,
if (copy_from_user(&trace, optval, sizeof(trace)))
return -EFAULT;
+ if (trace.rx_traces > RDS_MSG_RX_DGRAM_TRACE_MAX)
+ return -EFAULT;
+
rs->rs_rx_traces = trace.rx_traces;
for (i = 0; i < rs->rs_rx_traces; i++) {
if (trace.rx_trace_pos[i] > RDS_MSG_RX_DGRAM_TRACE_MAX) {