From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH 2/3] time: Enable get/put_compat_itimerspec64 always Date: Sat, 16 Jun 2018 22:11:43 -0700 Message-ID: <20180617051144.29756-3-deepa.kernel@gmail.com> References: <20180617051144.29756-1-deepa.kernel@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180617051144.29756-1-deepa.kernel@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: y2038-bounces@lists.linaro.org Sender: "Y2038" To: arnd@arndb.de, tglx@linutronix.de, linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, viro@zeniv.linux.org.uk, y2038@lists.linaro.org List-Id: linux-api@vger.kernel.org VGhpcyB3aWxsIGFpZCBpbiBlbmFibGluZyB0aGUgY29tcGF0IHN5c2NhbGxzIG9uIDMyLWJpdAph cmNoaXRlY3R1cmVzIGxhdGVyIG9uLgoKQWxzbyBtb3ZlIGNvbXBhdF9pdGltZXJzcGVjIGFuZCBy ZWxhdGVkIGRlZmluZXMgdG8gY29tcGF0X3RpbWUuaC4KVGhlIGNvbXBhdF90aW1lLmggZmlsZSB3 aWxsIGV2ZW50dWFsbHkgYmUgZGVsZXRlZC4KClNpZ25lZC1vZmYtYnk6IERlZXBhIERpbmFtYW5p IDxkZWVwYS5rZXJuZWxAZ21haWwuY29tPgotLS0KIGluY2x1ZGUvbGludXgvY29tcGF0LmggICAg ICB8ICA5IC0tLS0tLS0tLQogaW5jbHVkZS9saW51eC9jb21wYXRfdGltZS5oIHwgIDkgKysrKysr KysrCiBrZXJuZWwvY29tcGF0LmMgICAgICAgICAgICAgfCAyOSAtLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQoga2VybmVsL3RpbWUvdGltZS5jICAgICAgICAgIHwgMjEgKysrKysrKysrKysr KysrKysrKysrCiA0IGZpbGVzIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKyksIDM4IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvY29tcGF0LmggYi9pbmNsdWRlL2xpbnV4 L2NvbXBhdC5oCmluZGV4IGIxYTU1NjJiMzIxNS4uMThhMTNmMmRmMTRiIDEwMDY0NAotLS0gYS9p bmNsdWRlL2xpbnV4L2NvbXBhdC5oCisrKyBiL2luY2x1ZGUvbGludXgvY29tcGF0LmgKQEAgLTEw OSwxMSArMTA5LDYgQEAgdHlwZWRlZgljb21wYXRfdWxvbmdfdAkJY29tcGF0X2Fpb19jb250ZXh0 X3Q7CiBzdHJ1Y3QgY29tcGF0X3NlbF9hcmdfc3RydWN0Owogc3RydWN0IHJ1c2FnZTsKIAotc3Ry dWN0IGNvbXBhdF9pdGltZXJzcGVjIHsKLQlzdHJ1Y3QgY29tcGF0X3RpbWVzcGVjIGl0X2ludGVy dmFsOwotCXN0cnVjdCBjb21wYXRfdGltZXNwZWMgaXRfdmFsdWU7Ci19OwotCiBzdHJ1Y3QgY29t cGF0X3V0aW1idWYgewogCWNvbXBhdF90aW1lX3QJCWFjdGltZTsKIAljb21wYXRfdGltZV90CQlt b2R0aW1lOwpAQCAtMjk0LDEwICsyODksNiBAQCBleHRlcm4gaW50IGNvbXBhdF9nZXRfdGltZXNw ZWMoc3RydWN0IHRpbWVzcGVjICosIGNvbnN0IHZvaWQgX191c2VyICopOwogZXh0ZXJuIGludCBj b21wYXRfcHV0X3RpbWVzcGVjKGNvbnN0IHN0cnVjdCB0aW1lc3BlYyAqLCB2b2lkIF9fdXNlciAq KTsKIGV4dGVybiBpbnQgY29tcGF0X2dldF90aW1ldmFsKHN0cnVjdCB0aW1ldmFsICosIGNvbnN0 IHZvaWQgX191c2VyICopOwogZXh0ZXJuIGludCBjb21wYXRfcHV0X3RpbWV2YWwoY29uc3Qgc3Ry dWN0IHRpbWV2YWwgKiwgdm9pZCBfX3VzZXIgKik7Ci1leHRlcm4gaW50IGdldF9jb21wYXRfaXRp bWVyc3BlYzY0KHN0cnVjdCBpdGltZXJzcGVjNjQgKml0cywKLQkJCWNvbnN0IHN0cnVjdCBjb21w YXRfaXRpbWVyc3BlYyBfX3VzZXIgKnVpdHMpOwotZXh0ZXJuIGludCBwdXRfY29tcGF0X2l0aW1l cnNwZWM2NChjb25zdCBzdHJ1Y3QgaXRpbWVyc3BlYzY0ICppdHMsCi0JCQlzdHJ1Y3QgY29tcGF0 X2l0aW1lcnNwZWMgX191c2VyICp1aXRzKTsKIAogc3RydWN0IGNvbXBhdF9pb3ZlYyB7CiAJY29t cGF0X3VwdHJfdAlpb3ZfYmFzZTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvY29tcGF0X3Rp bWUuaCBiL2luY2x1ZGUvbGludXgvY29tcGF0X3RpbWUuaAppbmRleCAzMWYyNzc0ZjE5OTQuLmU3 MGJmZDFkMmMzZiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9jb21wYXRfdGltZS5oCisrKyBi L2luY2x1ZGUvbGludXgvY29tcGF0X3RpbWUuaApAQCAtMTcsNyArMTcsMTYgQEAgc3RydWN0IGNv bXBhdF90aW1ldmFsIHsKIAlzMzIJCXR2X3VzZWM7CiB9OwogCitzdHJ1Y3QgY29tcGF0X2l0aW1l cnNwZWMgeworCXN0cnVjdCBjb21wYXRfdGltZXNwZWMgaXRfaW50ZXJ2YWw7CisJc3RydWN0IGNv bXBhdF90aW1lc3BlYyBpdF92YWx1ZTsKK307CisKIGV4dGVybiBpbnQgY29tcGF0X2dldF90aW1l c3BlYzY0KHN0cnVjdCB0aW1lc3BlYzY0ICosIGNvbnN0IHZvaWQgX191c2VyICopOwogZXh0ZXJu IGludCBjb21wYXRfcHV0X3RpbWVzcGVjNjQoY29uc3Qgc3RydWN0IHRpbWVzcGVjNjQgKiwgdm9p ZCBfX3VzZXIgKik7CitleHRlcm4gaW50IGdldF9jb21wYXRfaXRpbWVyc3BlYzY0KHN0cnVjdCBp dGltZXJzcGVjNjQgKml0cywKKwkJCWNvbnN0IHN0cnVjdCBjb21wYXRfaXRpbWVyc3BlYyBfX3Vz ZXIgKnVpdHMpOworZXh0ZXJuIGludCBwdXRfY29tcGF0X2l0aW1lcnNwZWM2NChjb25zdCBzdHJ1 Y3QgaXRpbWVyc3BlYzY0ICppdHMsCisJCQlzdHJ1Y3QgY29tcGF0X2l0aW1lcnNwZWMgX191c2Vy ICp1aXRzKTsKIAogI2VuZGlmIC8qIF9MSU5VWF9DT01QQVRfVElNRV9IICovCmRpZmYgLS1naXQg YS9rZXJuZWwvY29tcGF0LmMgYi9rZXJuZWwvY29tcGF0LmMKaW5kZXggNzAyYWE4NDZkZGFjLi44 ZTQwZWZjMjkyOGEgMTAwNjQ0Ci0tLSBhL2tlcm5lbC9jb21wYXQuYworKysgYi9rZXJuZWwvY29t cGF0LmMKQEAgLTMyNCwzNSArMzI0LDYgQEAgQ09NUEFUX1NZU0NBTExfREVGSU5FMyhzY2hlZF9n ZXRhZmZpbml0eSwgY29tcGF0X3BpZF90LCAgcGlkLCB1bnNpZ25lZCBpbnQsIGxlbiwKIAlyZXR1 cm4gcmV0OwogfQogCi0vKiBUb2RvOiBEZWxldGUgdGhlc2UgZXh0ZXJuIGRlY2xhcmF0aW9ucyB3 aGVuIGdldC9wdXRfY29tcGF0X2l0aW1lcnNwZWM2NCgpCi0gKiBhcmUgbW92ZWQgdG8ga2VybmVs L3RpbWUvdGltZS5jIC4KLSAqLwotZXh0ZXJuIGludCBfX2NvbXBhdF9nZXRfdGltZXNwZWM2NChz dHJ1Y3QgdGltZXNwZWM2NCAqdHM2NCwKLQkJCQkgICBjb25zdCBzdHJ1Y3QgY29tcGF0X3RpbWVz cGVjIF9fdXNlciAqY3RzKTsKLWV4dGVybiBpbnQgX19jb21wYXRfcHV0X3RpbWVzcGVjNjQoY29u c3Qgc3RydWN0IHRpbWVzcGVjNjQgKnRzNjQsCi0JCQkJICAgc3RydWN0IGNvbXBhdF90aW1lc3Bl YyBfX3VzZXIgKmN0cyk7Ci0KLWludCBnZXRfY29tcGF0X2l0aW1lcnNwZWM2NChzdHJ1Y3QgaXRp bWVyc3BlYzY0ICppdHMsCi0JCQljb25zdCBzdHJ1Y3QgY29tcGF0X2l0aW1lcnNwZWMgX191c2Vy ICp1aXRzKQotewotCi0JaWYgKF9fY29tcGF0X2dldF90aW1lc3BlYzY0KCZpdHMtPml0X2ludGVy dmFsLCAmdWl0cy0+aXRfaW50ZXJ2YWwpIHx8Ci0JICAgIF9fY29tcGF0X2dldF90aW1lc3BlYzY0 KCZpdHMtPml0X3ZhbHVlLCAmdWl0cy0+aXRfdmFsdWUpKQotCQlyZXR1cm4gLUVGQVVMVDsKLQly ZXR1cm4gMDsKLX0KLUVYUE9SVF9TWU1CT0xfR1BMKGdldF9jb21wYXRfaXRpbWVyc3BlYzY0KTsK LQotaW50IHB1dF9jb21wYXRfaXRpbWVyc3BlYzY0KGNvbnN0IHN0cnVjdCBpdGltZXJzcGVjNjQg Kml0cywKLQkJCXN0cnVjdCBjb21wYXRfaXRpbWVyc3BlYyBfX3VzZXIgKnVpdHMpCi17Ci0JaWYg KF9fY29tcGF0X3B1dF90aW1lc3BlYzY0KCZpdHMtPml0X2ludGVydmFsLCAmdWl0cy0+aXRfaW50 ZXJ2YWwpIHx8Ci0JICAgIF9fY29tcGF0X3B1dF90aW1lc3BlYzY0KCZpdHMtPml0X3ZhbHVlLCAm dWl0cy0+aXRfdmFsdWUpKQotCQlyZXR1cm4gLUVGQVVMVDsKLQlyZXR1cm4gMDsKLX0KLUVYUE9S VF9TWU1CT0xfR1BMKHB1dF9jb21wYXRfaXRpbWVyc3BlYzY0KTsKLQogLyoKICAqIFdlIGN1cnJl bnRseSBvbmx5IG5lZWQgdGhlIGZvbGxvd2luZyBmaWVsZHMgZnJvbSB0aGUgc2lnZXZlbnQKICAq IHN0cnVjdHVyZTogc2lnZXZfdmFsdWUsIHNpZ2V2X3NpZ25vLCBzaWdfbm90aWZ5IGFuZCAoc29t ZXRpbWVzCmRpZmYgLS1naXQgYS9rZXJuZWwvdGltZS90aW1lLmMgYi9rZXJuZWwvdGltZS90aW1l LmMKaW5kZXggNGU2NTkxNmUzZDEzLi5jNzM0MmUzMTM4ODYgMTAwNjQ0Ci0tLSBhL2tlcm5lbC90 aW1lL3RpbWUuYworKysgYi9rZXJuZWwvdGltZS90aW1lLmMKQEAgLTk1NywzICs5NTcsMjQgQEAg aW50IHB1dF9pdGltZXJzcGVjNjQoY29uc3Qgc3RydWN0IGl0aW1lcnNwZWM2NCAqaXQsCiAJcmV0 dXJuIHJldDsKIH0KIEVYUE9SVF9TWU1CT0xfR1BMKHB1dF9pdGltZXJzcGVjNjQpOworCitpbnQg Z2V0X2NvbXBhdF9pdGltZXJzcGVjNjQoc3RydWN0IGl0aW1lcnNwZWM2NCAqaXRzLAorCQkJY29u c3Qgc3RydWN0IGNvbXBhdF9pdGltZXJzcGVjIF9fdXNlciAqdWl0cykKK3sKKworCWlmIChfX2Nv bXBhdF9nZXRfdGltZXNwZWM2NCgmaXRzLT5pdF9pbnRlcnZhbCwgJnVpdHMtPml0X2ludGVydmFs KSB8fAorCSAgICBfX2NvbXBhdF9nZXRfdGltZXNwZWM2NCgmaXRzLT5pdF92YWx1ZSwgJnVpdHMt Pml0X3ZhbHVlKSkKKwkJcmV0dXJuIC1FRkFVTFQ7CisJcmV0dXJuIDA7Cit9CitFWFBPUlRfU1lN Qk9MX0dQTChnZXRfY29tcGF0X2l0aW1lcnNwZWM2NCk7CisKK2ludCBwdXRfY29tcGF0X2l0aW1l cnNwZWM2NChjb25zdCBzdHJ1Y3QgaXRpbWVyc3BlYzY0ICppdHMsCisJCQlzdHJ1Y3QgY29tcGF0 X2l0aW1lcnNwZWMgX191c2VyICp1aXRzKQoreworCWlmIChfX2NvbXBhdF9wdXRfdGltZXNwZWM2 NCgmaXRzLT5pdF9pbnRlcnZhbCwgJnVpdHMtPml0X2ludGVydmFsKSB8fAorCSAgICBfX2NvbXBh dF9wdXRfdGltZXNwZWM2NCgmaXRzLT5pdF92YWx1ZSwgJnVpdHMtPml0X3ZhbHVlKSkKKwkJcmV0 dXJuIC1FRkFVTFQ7CisJcmV0dXJuIDA7Cit9CitFWFBPUlRfU1lNQk9MX0dQTChwdXRfY29tcGF0 X2l0aW1lcnNwZWM2NCk7Ci0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fClkyMDM4IG1haWxpbmcgbGlzdApZMjAzOEBsaXN0cy5saW5hcm8u b3JnCmh0dHBzOi8vbGlzdHMubGluYXJvLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3kyMDM4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f196.google.com ([209.85.192.196]:43837 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752440AbeFQFMM (ORCPT ); Sun, 17 Jun 2018 01:12:12 -0400 From: Deepa Dinamani To: arnd@arndb.de, tglx@linutronix.de, linux-kernel@vger.kernel.org Cc: viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, y2038@lists.linaro.org Subject: [PATCH 2/3] time: Enable get/put_compat_itimerspec64 always Date: Sat, 16 Jun 2018 22:11:43 -0700 Message-Id: <20180617051144.29756-3-deepa.kernel@gmail.com> In-Reply-To: <20180617051144.29756-1-deepa.kernel@gmail.com> References: <20180617051144.29756-1-deepa.kernel@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: This will aid in enabling the compat syscalls on 32-bit architectures later on. Also move compat_itimerspec and related defines to compat_time.h. The compat_time.h file will eventually be deleted. Signed-off-by: Deepa Dinamani --- include/linux/compat.h | 9 --------- include/linux/compat_time.h | 9 +++++++++ kernel/compat.c | 29 ----------------------------- kernel/time/time.c | 21 +++++++++++++++++++++ 4 files changed, 30 insertions(+), 38 deletions(-) diff --git a/include/linux/compat.h b/include/linux/compat.h index b1a5562b3215..18a13f2df14b 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -109,11 +109,6 @@ typedef compat_ulong_t compat_aio_context_t; struct compat_sel_arg_struct; struct rusage; -struct compat_itimerspec { - struct compat_timespec it_interval; - struct compat_timespec it_value; -}; - struct compat_utimbuf { compat_time_t actime; compat_time_t modtime; @@ -294,10 +289,6 @@ extern int compat_get_timespec(struct timespec *, const void __user *); extern int compat_put_timespec(const struct timespec *, void __user *); extern int compat_get_timeval(struct timeval *, const void __user *); extern int compat_put_timeval(const struct timeval *, void __user *); -extern int get_compat_itimerspec64(struct itimerspec64 *its, - const struct compat_itimerspec __user *uits); -extern int put_compat_itimerspec64(const struct itimerspec64 *its, - struct compat_itimerspec __user *uits); struct compat_iovec { compat_uptr_t iov_base; diff --git a/include/linux/compat_time.h b/include/linux/compat_time.h index 31f2774f1994..e70bfd1d2c3f 100644 --- a/include/linux/compat_time.h +++ b/include/linux/compat_time.h @@ -17,7 +17,16 @@ struct compat_timeval { s32 tv_usec; }; +struct compat_itimerspec { + struct compat_timespec it_interval; + struct compat_timespec it_value; +}; + extern int compat_get_timespec64(struct timespec64 *, const void __user *); extern int compat_put_timespec64(const struct timespec64 *, void __user *); +extern int get_compat_itimerspec64(struct itimerspec64 *its, + const struct compat_itimerspec __user *uits); +extern int put_compat_itimerspec64(const struct itimerspec64 *its, + struct compat_itimerspec __user *uits); #endif /* _LINUX_COMPAT_TIME_H */ diff --git a/kernel/compat.c b/kernel/compat.c index 702aa846ddac..8e40efc2928a 100644 --- a/kernel/compat.c +++ b/kernel/compat.c @@ -324,35 +324,6 @@ COMPAT_SYSCALL_DEFINE3(sched_getaffinity, compat_pid_t, pid, unsigned int, len, return ret; } -/* Todo: Delete these extern declarations when get/put_compat_itimerspec64() - * are moved to kernel/time/time.c . - */ -extern int __compat_get_timespec64(struct timespec64 *ts64, - const struct compat_timespec __user *cts); -extern int __compat_put_timespec64(const struct timespec64 *ts64, - struct compat_timespec __user *cts); - -int get_compat_itimerspec64(struct itimerspec64 *its, - const struct compat_itimerspec __user *uits) -{ - - if (__compat_get_timespec64(&its->it_interval, &uits->it_interval) || - __compat_get_timespec64(&its->it_value, &uits->it_value)) - return -EFAULT; - return 0; -} -EXPORT_SYMBOL_GPL(get_compat_itimerspec64); - -int put_compat_itimerspec64(const struct itimerspec64 *its, - struct compat_itimerspec __user *uits) -{ - if (__compat_put_timespec64(&its->it_interval, &uits->it_interval) || - __compat_put_timespec64(&its->it_value, &uits->it_value)) - return -EFAULT; - return 0; -} -EXPORT_SYMBOL_GPL(put_compat_itimerspec64); - /* * We currently only need the following fields from the sigevent * structure: sigev_value, sigev_signo, sig_notify and (sometimes diff --git a/kernel/time/time.c b/kernel/time/time.c index 4e65916e3d13..c7342e313886 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -957,3 +957,24 @@ int put_itimerspec64(const struct itimerspec64 *it, return ret; } EXPORT_SYMBOL_GPL(put_itimerspec64); + +int get_compat_itimerspec64(struct itimerspec64 *its, + const struct compat_itimerspec __user *uits) +{ + + if (__compat_get_timespec64(&its->it_interval, &uits->it_interval) || + __compat_get_timespec64(&its->it_value, &uits->it_value)) + return -EFAULT; + return 0; +} +EXPORT_SYMBOL_GPL(get_compat_itimerspec64); + +int put_compat_itimerspec64(const struct itimerspec64 *its, + struct compat_itimerspec __user *uits) +{ + if (__compat_put_timespec64(&its->it_interval, &uits->it_interval) || + __compat_put_timespec64(&its->it_value, &uits->it_value)) + return -EFAULT; + return 0; +} +EXPORT_SYMBOL_GPL(put_compat_itimerspec64); -- 2.17.1