Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752763AbdFSSe7 (ORCPT + 2 others); Mon, 19 Jun 2017 14:34:59 -0400 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:51947 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752671AbdFSSe5 (ORCPT ); Mon, 19 Jun 2017 14:34:57 -0400 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux@roeck-us.net Cc: Eric Dumazet , Linus Torvalds , Willy Tarreau Subject: [PATCH 3.10 129/268] sysctl: fix proc_doulongvec_ms_jiffies_minmax() Date: Mon, 19 Jun 2017 20:30:28 +0200 Message-Id: <1497897167-14556-130-git-send-email-w@1wt.eu> X-Mailer: git-send-email 2.8.0.rc2.1.gbe9624a In-Reply-To: <1497897167-14556-1-git-send-email-w@1wt.eu> References: <1497897167-14556-1-git-send-email-w@1wt.eu> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: From: Eric Dumazet commit ff9f8a7cf935468a94d9927c68b00daae701667e upstream. We perform the conversion between kernel jiffies and ms only when exporting kernel value to user space. We need to do the opposite operation when value is written by user. Only matters when HZ != 1000 Signed-off-by: Eric Dumazet Signed-off-by: Linus Torvalds Signed-off-by: Willy Tarreau --- kernel/sysctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 4fd49fe..430725d 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2224,6 +2224,7 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int break; if (neg) continue; + val = convmul * val / convdiv; if ((min && val < *min) || (max && val > *max)) continue; *i = val; -- 2.8.0.rc2.1.gbe9624a