git: df49edfec89c - stable/13 - linux(4): Futex address must be 32-bit aligned.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 Jun 2022 19:37:36 UTC
The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=df49edfec89c9ab95f636df31b53e247ccc5bfc0 commit df49edfec89c9ab95f636df31b53e247ccc5bfc0 Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2021-07-29 09:50:58 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2022-06-17 19:33:21 +0000 linux(4): Futex address must be 32-bit aligned. Linux futex documentation explicitly states that EINVAL is returned if the futex is not 4-byte aligned. Check futex alignment as a Linux do and return EINVAL. Differential Revision: https://reviews.freebsd.org/D31279 MFC after: 2 weeks (cherry picked from commit dad107705667dfca89db796c1c075a782f4666d4) --- sys/compat/linux/linux_futex.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index b002d7281171..c81fe20212a2 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -125,6 +125,7 @@ struct linux_futex_args { struct timespec kts; }; +static inline int futex_key_get(const void *, int, int, struct umtx_key *); static void linux_umtx_abs_timeout_init(struct umtx_abs_timeout *, struct linux_futex_args *); static int linux_futex(struct thread *, struct linux_futex_args *); @@ -137,6 +138,16 @@ static int linux_futex_unlock_pi(struct thread *, bool, struct linux_futex_args *); static int futex_wake_pi(struct thread *, uint32_t *, bool); +static int +futex_key_get(const void *uaddr, int type, int share, struct umtx_key *key) +{ + + /* Check that futex address is a 32bit aligned. */ + if (!__is_aligned(uaddr, sizeof(uint32_t))) + return (EINVAL); + return (umtx_key_get(uaddr, type, share, key)); +} + int futex_wake(struct thread *td, uint32_t *uaddr, int val, bool shared) { @@ -404,7 +415,7 @@ linux_futex_lock_pi(struct thread *td, bool try, struct linux_futex_args *args) em = em_find(td); uq = td->td_umtxq; - error = umtx_key_get(args->uaddr, TYPE_PI_FUTEX, GET_SHARED(args), + error = futex_key_get(args->uaddr, TYPE_PI_FUTEX, GET_SHARED(args), &uq->uq_key); if (error != 0) return (error); @@ -611,7 +622,7 @@ linux_futex_unlock_pi(struct thread *td, bool rb, struct linux_futex_args *args) if (!rb && (owner & FUTEX_TID_MASK) != em->em_tid) return (EPERM); - error = umtx_key_get(args->uaddr, TYPE_PI_FUTEX, GET_SHARED(args), &key); + error = futex_key_get(args->uaddr, TYPE_PI_FUTEX, GET_SHARED(args), &key); if (error != 0) return (error); umtxq_lock(&key); @@ -661,10 +672,10 @@ linux_futex_wakeop(struct thread *td, struct linux_futex_args *args) if (args->uaddr == args->uaddr2) return (EINVAL); - error = umtx_key_get(args->uaddr, TYPE_FUTEX, GET_SHARED(args), &key); + error = futex_key_get(args->uaddr, TYPE_FUTEX, GET_SHARED(args), &key); if (error != 0) return (error); - error = umtx_key_get(args->uaddr2, TYPE_FUTEX, GET_SHARED(args), &key2); + error = futex_key_get(args->uaddr2, TYPE_FUTEX, GET_SHARED(args), &key2); if (error != 0) { umtx_key_release(&key); return (error); @@ -726,10 +737,10 @@ linux_futex_requeue(struct thread *td, struct linux_futex_args *args) if (nrwake < 0 || nrrequeue < 0) return (EINVAL); - error = umtx_key_get(args->uaddr, TYPE_FUTEX, GET_SHARED(args), &key); + error = futex_key_get(args->uaddr, TYPE_FUTEX, GET_SHARED(args), &key); if (error != 0) return (error); - error = umtx_key_get(args->uaddr2, TYPE_FUTEX, GET_SHARED(args), &key2); + error = futex_key_get(args->uaddr2, TYPE_FUTEX, GET_SHARED(args), &key2); if (error != 0) { umtx_key_release(&key); return (error); @@ -764,7 +775,7 @@ linux_futex_wake(struct thread *td, struct linux_futex_args *args) if (args->val3 == 0) return (EINVAL); - error = umtx_key_get(args->uaddr, TYPE_FUTEX, GET_SHARED(args), &key); + error = futex_key_get(args->uaddr, TYPE_FUTEX, GET_SHARED(args), &key); if (error != 0) return (error); umtxq_lock(&key); @@ -786,7 +797,7 @@ linux_futex_wait(struct thread *td, struct linux_futex_args *args) error = EINVAL; uq = td->td_umtxq; - error = umtx_key_get(args->uaddr, TYPE_FUTEX, GET_SHARED(args), + error = futex_key_get(args->uaddr, TYPE_FUTEX, GET_SHARED(args), &uq->uq_key); if (error != 0) return (error);