From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20150515080531.227876958@1wt.eu> Date: Fri, 15 May 2015 10:05:52 +0200 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , "David S. Miller" , Ben Hutchings , Willy Tarreau Subject: [ 22/48] net: llc: use correct size for sysctl timeout entries MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 In-Reply-To: <9c2783dfae10ef2d1e9b08bcc1e562c5@local> Sender: linux-kernel-owner@vger.kernel.org List-ID: 2.6.32-longterm review patch. If anyone has any objections, please let me know. ------------------ From: Sasha Levin commit 6b8d9117ccb4f81b1244aafa7bc70ef8fa45fc49 upstream. The timeout entries are sizeof(int) rather than sizeof(long), which means that when they were getting read we'd also leak kernel memory to userspace along with the timeout values. Signed-off-by: Sasha Levin Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings (cherry picked from commit 88fe14be08a475ad0eea4ca7c51f32437baf41af) Signed-off-by: Willy Tarreau --- net/llc/sysctl_net_llc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c index 57b9304..cd78b3a 100644 --- a/net/llc/sysctl_net_llc.c +++ b/net/llc/sysctl_net_llc.c @@ -18,7 +18,7 @@ static struct ctl_table llc2_timeout_table[] = { .ctl_name = NET_LLC2_ACK_TIMEOUT, .procname = "ack", .data = &sysctl_llc2_ack_timeout, - .maxlen = sizeof(long), + .maxlen = sizeof(sysctl_llc2_ack_timeout), .mode = 0644, .proc_handler = proc_dointvec_jiffies, .strategy = sysctl_jiffies, @@ -27,7 +27,7 @@ static struct ctl_table llc2_timeout_table[] = { .ctl_name = NET_LLC2_BUSY_TIMEOUT, .procname = "busy", .data = &sysctl_llc2_busy_timeout, - .maxlen = sizeof(long), + .maxlen = sizeof(sysctl_llc2_busy_timeout), .mode = 0644, .proc_handler = proc_dointvec_jiffies, .strategy = sysctl_jiffies, @@ -36,7 +36,7 @@ static struct ctl_table llc2_timeout_table[] = { .ctl_name = NET_LLC2_P_TIMEOUT, .procname = "p", .data = &sysctl_llc2_p_timeout, - .maxlen = sizeof(long), + .maxlen = sizeof(sysctl_llc2_p_timeout), .mode = 0644, .proc_handler = proc_dointvec_jiffies, .strategy = sysctl_jiffies, @@ -45,7 +45,7 @@ static struct ctl_table llc2_timeout_table[] = { .ctl_name = NET_LLC2_REJ_TIMEOUT, .procname = "rej", .data = &sysctl_llc2_rej_timeout, - .maxlen = sizeof(long), + .maxlen = sizeof(sysctl_llc2_rej_timeout), .mode = 0644, .proc_handler = proc_dointvec_jiffies, .strategy = sysctl_jiffies, -- 1.7.12.2.21.g234cd45.dirty