From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933668AbbI3L2T (ORCPT ); Wed, 30 Sep 2015 07:28:19 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:55150 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933333AbbI3L1S (ORCPT ); Wed, 30 Sep 2015 07:27:18 -0400 From: Arnd Bergmann To: netdev@vger.kernel.org Cc: y2038@lists.linaro.org, linux-kernel@vger.kernel.org, "David S. Miller" , Arnd Bergmann , Vlad Yasevich , Neil Horman , linux-sctp@vger.kernel.org Subject: [PATCH 10/12] net: sctp: avoid incorrect time_t use Date: Wed, 30 Sep 2015 13:26:40 +0200 Message-Id: <1443612402-3000775-11-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1443612402-3000775-1-git-send-email-arnd@arndb.de> References: <1443612402-3000775-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:Vvhy5OfIrDDWwT3AAZ87XxbferraV5x/jBJsyiYsu/Qc8xiNICE wr3nvj7jE85AxDbaA2udXopAoByvTKXtBpPLdDWkAiCR0XIvpv0ZAK6pt/lba9VTflBw8VI WWfJzF+cLq93cU7FDIA4nkmTDT8rZzdu6+KU7QHjWTIuQ5Tgd7sYPwkMnHTbWOm0eFOS/wT l67XuFnNX2yhGEJFCTE6Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:yHwVQ80ohlg=:s3u0/0Xkw5Hcow8/9aH1cn LEti7klfZgRqsq4eAZju3BWhz3PPl0hUlBoUWGwL1O0tnUR0mqhxR9W52BIxuW6Xr/uBDWizg yvPBWsRXQj1+OTo06uCq/BS9wBx4JsYSPWrr6SJI+6aIUWE90QWYPS3PLkIeUqOAoJZmF+6o3 dFhEMftdhbEiPtNB5UFvm099Rw0h3McRK8Elge287RvzeTyPL19jvLrOHrkUFVYhoG3BV9BEG 30u3J/xcPUGzI4QaFlwrbmge7sfasPCNsFJIOWxRPuQ6gQqcJWndDTAZAxewgTbBO0r/RSRl1 IyHZZJ4oQsDIo+foLnQCEbj8PZ0sH7uneeAAESjiJ2GRyG7VyIbMl22gBiDAJ7PaDQOyyireM I4WPs041rH3VZ/ebTmtDJovF3gPQW33ZZE3UNRfR45+cWBKk81c7r7O1q7G0NDR/IVcX5kjJi E2hjJEWfjgWxoYmYSLbQWpoTwVcMzFMsiv6T02ewbQDXGNz6tIfYKZJqUfW49avgSIKCuis2k 9jNfScCoIuUzeWwvoix6Tb3F6j/vSn4RNMdTt2PmUEJPGiLswM14oaSU1FQg7F6MfEq+s42Md 3U2orblRs6SftikNJwuvl1ki0VoovTc0F9IF8ssvtn3uVy+p3gYZxg7IrlrBGykWcvWcHMLuO 0hQCE20/CkxkfNyA/Kl+7j8cB/PNGL408vb7YhOK70hKNOXCHG781acvF6lNxTJw6o2s= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We want to avoid using time_t in the kernel because of the y2038 overflow problem. The use in sctp is not for storing seconds at all, but instead uses microseconds and is passed as 32-bit on all machines. This patch changes the type to u32, which better fits the use. Signed-off-by: Arnd Bergmann Cc: Vlad Yasevich Cc: Neil Horman Cc: linux-sctp@vger.kernel.org --- net/sctp/sm_make_chunk.c | 2 +- net/sctp/sm_statefuns.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 7954c52e1794..763e06a55155 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -2494,7 +2494,7 @@ static int sctp_process_param(struct sctp_association *asoc, __u16 sat; int retval = 1; sctp_scope_t scope; - time_t stale; + u32 stale; struct sctp_af *af; union sctp_addr_param *addr_param; struct sctp_transport *t; diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index d7eaa7354cf7..6f46aa16cb76 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c @@ -2306,7 +2306,7 @@ static sctp_disposition_t sctp_sf_do_5_2_6_stale(struct net *net, sctp_cmd_seq_t *commands) { struct sctp_chunk *chunk = arg; - time_t stale; + u32 stale; sctp_cookie_preserve_param_t bht; sctp_errhdr_t *err; struct sctp_chunk *reply; -- 2.1.0.rc2