diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 13:17:57 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-11 13:17:57 -0400 |
| commit | 0d1087bb6f7227a397488466a922d0c53e64daee (patch) | |
| tree | 2bb4f18f44fed332e6263f3f61c603c50fdcc2e2 | |
| parent | c50adc3bd4a96f1e17bdc78df6c0742845bbdc4b (diff) | |
| download | longterm-queue-4.18-0d1087bb6f7227a397488466a922d0c53e64daee.tar.gz | |
ethtool: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ethtool-fix-potential-userspace-buffer-overflow.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/queue/ethtool-fix-potential-userspace-buffer-overflow.patch b/queue/ethtool-fix-potential-userspace-buffer-overflow.patch index d075b4c..deff006 100644 --- a/queue/ethtool-fix-potential-userspace-buffer-overflow.patch +++ b/queue/ethtool-fix-potential-userspace-buffer-overflow.patch @@ -1,4 +1,4 @@ -From 0ee4e76937d69128a6a66861ba393ebdc2ffc8a2 Mon Sep 17 00:00:00 2001 +From 9c70b0d20c6cae6c744498c913f65bff5a92ffbb Mon Sep 17 00:00:00 2001 From: Vivien Didelot <vivien.didelot@gmail.com> Date: Mon, 3 Jun 2019 16:57:13 -0400 Subject: [PATCH] ethtool: fix potential userspace buffer overflow @@ -27,12 +27,12 @@ Reviewed-by: Michal Kubecek <mkubecek@suse.cz> Signed-off-by: David S. Miller <davem@davemloft.net> diff --git a/net/core/ethtool.c b/net/core/ethtool.c -index 43e9add58340..1a0196fbb49c 100644 +index eea543a27b62..812256647b69 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c -@@ -1359,13 +1359,16 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr) - if (!regbuf) - return -ENOMEM; +@@ -1430,13 +1430,16 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr) + return -ENOMEM; + } + if (regs.len < reglen) + reglen = regs.len; @@ -49,5 +49,5 @@ index 43e9add58340..1a0196fbb49c 100644 ret = 0; -- -2.9.5 +2.7.4 |