diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-02-04 18:07:03 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-02-04 18:07:03 +0000 |
| commit | 0f166953f72731daca1ddf8311d6e828723ff062 (patch) | |
| tree | 8d524ad54d89ebcef230b78e072d7f191af10440 | |
| parent | 2d01f2dee3186137a7cff88d2aa5ee0e7a84e93a (diff) | |
| download | src-0f166953f72731daca1ddf8311d6e828723ff062.tar.gz src-0f166953f72731daca1ddf8311d6e828723ff062.zip | |
Use NLDT to get number of LDTs on i386
Compiling a GENERIC kernel for i386 with clang 8.0 results in the
following warning:
/usr/src/sys/i386/i386/sys_machdep.c:542:40: error: 'sizeof ((ldt))' will return the size of the pointer, not the array itself [-Werror,-Wsizeof-pointer-div]
nldt = pldt != NULL ? pldt->ldt_len : nitems(ldt);
^~~~~~~~~~~
/usr/src/sys/sys/param.h:299:32: note: expanded from macro 'nitems'
#define nitems(x) (sizeof((x)) / sizeof((x)[0]))
~~~~~~~~~~~ ^
Indeed, 'ldt' is declared as 'union descriptor *', so nitems() is not
the right way to determine the number of LDTs. Instead, the NLDT define
from sys/x86/include/segments.h should be used.
Reviewed by: kib
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D19074
Notes
Notes:
svn path=/head/; revision=343748
| -rw-r--r-- | sys/i386/i386/sys_machdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index 7d576db90fc4..b5bac44f9d58 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -539,7 +539,7 @@ i386_get_ldt(struct thread *td, struct i386_ldt_args *uap) data = malloc(num * sizeof(union descriptor), M_TEMP, M_WAITOK); mtx_lock_spin(&dt_lock); pldt = td->td_proc->p_md.md_ldt; - nldt = pldt != NULL ? pldt->ldt_len : nitems(ldt); + nldt = pldt != NULL ? pldt->ldt_len : NLDT; if (uap->start >= nldt) { num = 0; } else { |