Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 4 Feb 2019 17:53:30 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r343747 - projects/clang800-import/sys/i386/i386
Message-ID:  <201902041753.x14HrUu1077876@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dim
Date: Mon Feb  4 17:53:29 2019
New Revision: 343747
URL: https://svnweb.freebsd.org/changeset/base/343747

Log:
  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

Modified:
  projects/clang800-import/sys/i386/i386/sys_machdep.c

Modified: projects/clang800-import/sys/i386/i386/sys_machdep.c
==============================================================================
--- projects/clang800-import/sys/i386/i386/sys_machdep.c	Mon Feb  4 16:55:24 2019	(r343746)
+++ projects/clang800-import/sys/i386/i386/sys_machdep.c	Mon Feb  4 17:53:29 2019	(r343747)
@@ -539,7 +539,7 @@ i386_get_ldt(struct thread *td, struct i386_ldt_args *
 	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 {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902041753.x14HrUu1077876>