| Message ID | 20151118063643.GA16239@waves |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com> Date: Wed, 18 Nov 2015 08:36:44 +0200 > Changes the definition of the pointer _expiry from time_t to > time64_t. This is to handle the Y2038 problem where time_t > will overflow in the year 2038. The change is safe because > the kernel subsystems that call dns_query pass NULL. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com> > --- > Changelog: > v1: The changes were originally made by Arnd Bergmann in > relation to time_t. I've broken down a patch sent to me > into two independent patches. Want me to apply this to 'net'? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wednesday 18 November 2015 15:20:25 David Miller wrote: > From: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com> > Date: Wed, 18 Nov 2015 08:36:44 +0200 > > > Changes the definition of the pointer _expiry from time_t to > > time64_t. This is to handle the Y2038 problem where time_t > > will overflow in the year 2038. The change is safe because > > the kernel subsystems that call dns_query pass NULL. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com> > > --- > > Changelog: > > v1: The changes were originally made by Arnd Bergmann in > > relation to time_t. I've broken down a patch sent to me > > into two independent patches. > > Want me to apply this to 'net'? Yes, I think that would be good. The original patch was touching both the key and net subsystems, but this patch makes sense by itself now, and it helps keep the other half isolated to the key code. Arnd -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Arnd Bergmann <arnd@arndb.de> Date: Wed, 18 Nov 2015 22:08:54 +0100 > On Wednesday 18 November 2015 15:20:25 David Miller wrote: >> From: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com> >> Date: Wed, 18 Nov 2015 08:36:44 +0200 >> >> > Changes the definition of the pointer _expiry from time_t to >> > time64_t. This is to handle the Y2038 problem where time_t >> > will overflow in the year 2038. The change is safe because >> > the kernel subsystems that call dns_query pass NULL. >> > >> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> > Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com> >> > --- >> > Changelog: >> > v1: The changes were originally made by Arnd Bergmann in >> > relation to time_t. I've broken down a patch sent to me >> > into two independent patches. >> >> Want me to apply this to 'net'? > > Yes, I think that would be good. The original patch was touching > both the key and net subsystems, but this patch makes sense by itself > now, and it helps keep the other half isolated to the key code. OK, it sounds like we can simply delete the argument if nobody in-tree uses it. But whatever... applied thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller <davem@davemloft.net> wrote: > From: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com> > Date: Wed, 18 Nov 2015 08:36:44 +0200 > > > Changes the definition of the pointer _expiry from time_t to > > time64_t. This is to handle the Y2038 problem where time_t > > will overflow in the year 2038. The change is safe because > > the kernel subsystems that call dns_query pass NULL. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com> > > --- > > Changelog: > > v1: The changes were originally made by Arnd Bergmann in > > relation to time_t. I've broken down a patch sent to me > > into two independent patches. > > Want me to apply this to 'net'? Fine by me. Acked-by: David Howells <dhowells@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/dns_resolver.h b/include/linux/dns_resolver.h index cc92268..6ac3cad 100644 --- a/include/linux/dns_resolver.h +++ b/include/linux/dns_resolver.h @@ -27,7 +27,7 @@ #ifdef __KERNEL__ extern int dns_query(const char *type, const char *name, size_t namelen, - const char *options, char **_result, time_t *_expiry); + const char *options, char **_result, time64_t *_expiry); #endif /* KERNEL */ diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c index 4677b6f..ecc28cf 100644 --- a/net/dns_resolver/dns_query.c +++ b/net/dns_resolver/dns_query.c @@ -67,7 +67,7 @@ * Returns the size of the result on success, -ve error code otherwise. */ int dns_query(const char *type, const char *name, size_t namelen, - const char *options, char **_result, time_t *_expiry) + const char *options, char **_result, time64_t *_expiry) { struct key *rkey; const struct user_key_payload *upayload;