Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Jul 2017 00:40:14 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r321741 - stable/11/sys/dev/ksyms
Message-ID:  <201707310040.v6V0eEQV032181@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Mon Jul 31 00:40:14 2017
New Revision: 321741
URL: https://svnweb.freebsd.org/changeset/base/321741

Log:
  MFC r321640:
  Fix style bugs in ksyms.c.

Modified:
  stable/11/sys/dev/ksyms/ksyms.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/ksyms/ksyms.c
==============================================================================
--- stable/11/sys/dev/ksyms/ksyms.c	Mon Jul 31 00:39:22 2017	(r321740)
+++ stable/11/sys/dev/ksyms/ksyms.c	Mon Jul 31 00:40:14 2017	(r321741)
@@ -62,41 +62,40 @@
 
 #define STR_SYMTAB	".symtab"
 #define STR_STRTAB	".strtab"
-#define STR_SHSTRTAB	".shstrtab" 
+#define STR_SHSTRTAB	".shstrtab"
 
 #define KSYMS_DNAME	"ksyms"
 
-static	d_open_t 	ksyms_open;
-static	d_read_t	ksyms_read;
-static	d_close_t	ksyms_close;
-static	d_ioctl_t	ksyms_ioctl;
-static	d_mmap_t	ksyms_mmap;
+static d_open_t ksyms_open;
+static d_read_t ksyms_read;
+static d_close_t ksyms_close;
+static d_ioctl_t ksyms_ioctl;
+static d_mmap_t ksyms_mmap;
 
 static struct cdevsw ksyms_cdevsw = {
-    .d_version	=	D_VERSION,
-    .d_flags	=	D_TRACKCLOSE,
-    .d_open	=	ksyms_open,
-    .d_close	=	ksyms_close,
-    .d_read	=	ksyms_read,
-    .d_ioctl	=	ksyms_ioctl,
-    .d_mmap	=	ksyms_mmap,
-    .d_name	=	KSYMS_DNAME	
+	.d_version =	D_VERSION,
+	.d_flags =	D_TRACKCLOSE,
+	.d_open =	ksyms_open,
+	.d_close =	ksyms_close,
+	.d_read =	ksyms_read,
+	.d_ioctl =	ksyms_ioctl,
+	.d_mmap =	ksyms_mmap,
+	.d_name =	KSYMS_DNAME
 };
 
 struct ksyms_softc {
 	LIST_ENTRY(ksyms_softc)	sc_list;
-	vm_offset_t 		sc_uaddr;
-	size_t 			sc_usize;
+	vm_offset_t		sc_uaddr;
+	size_t			sc_usize;
 	pmap_t			sc_pmap;
 	struct proc	       *sc_proc;
 };
 
-static struct mtx 		 ksyms_mtx;
-static struct cdev 		*ksyms_dev;
-static LIST_HEAD(, ksyms_softc)	 ksyms_list = 
-	LIST_HEAD_INITIALIZER(ksyms_list);
+static struct mtx		 ksyms_mtx;
+static struct cdev		*ksyms_dev;
+static LIST_HEAD(, ksyms_softc)	 ksyms_list = LIST_HEAD_INITIALIZER(ksyms_list);
 
-static const char 	ksyms_shstrtab[] = 
+static const char	ksyms_shstrtab[] =
 	"\0" STR_SYMTAB "\0" STR_STRTAB "\0" STR_SHSTRTAB "\0";
 
 struct ksyms_hdr {
@@ -106,7 +105,7 @@ struct ksyms_hdr {
 	Elf_Shdr	kh_shdr[SHDR_NUM];
 	char		kh_shstrtab[sizeof(ksyms_shstrtab)];
 };
-	
+
 struct tsizes {
 	size_t		ts_symsz;
 	size_t		ts_strsz;
@@ -123,7 +122,7 @@ static MALLOC_DEFINE(M_KSYMS, "KSYMS", "Kernel Symbol 
 
 /*
  * Get the symbol and string table sizes for a kernel module. Add it to the
- * running total. 
+ * running total.
  */
 static int
 ksyms_size_permod(linker_file_t lf, void *arg)
@@ -132,35 +131,36 @@ ksyms_size_permod(linker_file_t lf, void *arg)
 	const Elf_Sym *symtab;
 	caddr_t strtab;
 	long syms;
-	
+
 	ts = arg;
-    
+
 	syms = LINKER_SYMTAB_GET(lf, &symtab);
 	ts->ts_symsz += syms * sizeof(Elf_Sym);
 	ts->ts_strsz += LINKER_STRTAB_GET(lf, &strtab);
-	
+
 	return (0);
 }
 
 /*
  * For kernel module get the symbol and string table sizes, returning the
- * totals in *ts. 
+ * totals in *ts.
  */
-static void 
+static void
 ksyms_size_calc(struct tsizes *ts)
 {
+
 	ts->ts_symsz = 0;
 	ts->ts_strsz = 0;
-    
-	(void) linker_file_foreach(ksyms_size_permod, ts);
+
+	(void)linker_file_foreach(ksyms_size_permod, ts);
 }
 
-#define KSYMS_EMIT(src, des, sz) do {				\
-		copyout(src, (void *)des, sz);			\
-		des += sz;					\
-	} while (0)
+#define KSYMS_EMIT(src, des, sz) do {			\
+	copyout(src, (void *)des, sz);			\
+	des += sz;					\
+} while (0)
 
-#define SYMBLKSZ	256 * sizeof (Elf_Sym)
+#define SYMBLKSZ	(256 * sizeof(Elf_Sym))
 
 /*
  * For a kernel module, add the symbol and string tables into the
@@ -169,6 +169,7 @@ ksyms_size_calc(struct tsizes *ts)
 static int
 ksyms_add(linker_file_t lf, void *arg)
 {
+	char *buf;
 	struct toffsets *to;
 	const Elf_Sym *symtab;
 	Elf_Sym *symp;
@@ -176,43 +177,42 @@ ksyms_add(linker_file_t lf, void *arg)
 	long symsz;
 	size_t strsz, numsyms;
 	linker_symval_t symval;
-	char *buf;
 	int i, nsyms, len;
-	
+
 	to = arg;
-    
+
 	MOD_SLOCK;
 	numsyms =  LINKER_SYMTAB_GET(lf, &symtab);
 	strsz = LINKER_STRTAB_GET(lf, &strtab);
 	symsz = numsyms * sizeof(Elf_Sym);
-	
+
 	buf = malloc(SYMBLKSZ, M_KSYMS, M_WAITOK);
-	
+
 	while (symsz > 0) {
 		len = min(SYMBLKSZ, symsz);
 		bcopy(symtab, buf, len);
 
-		/* 
-		 * Fix up symbol table for kernel modules: 
-		 *   string offsets need adjusted 
+		/*
+		 * Fix up symbol table for kernel modules:
+		 *   string offsets need adjusted
 		 *   symbol values made absolute
 		 */
 		symp = (Elf_Sym *) buf;
-		nsyms = len / sizeof (Elf_Sym);
+		nsyms = len / sizeof(Elf_Sym);
 		for (i = 0; i < nsyms; i++) {
 			symp[i].st_name += to->to_stridx;
-			if (lf->id > 1 && LINKER_SYMBOL_VALUES(lf, 
-				(c_linker_sym_t) &symtab[i], &symval) == 0) {
-				symp[i].st_value = (uintptr_t) symval.value;
+			if (lf->id > 1 && LINKER_SYMBOL_VALUES(lf,
+			    (c_linker_sym_t)&symtab[i], &symval) == 0) {
+				symp[i].st_value = (uintptr_t)symval.value;
 			}
 		}
 
-		if (len > to->to_resid) { 
+		if (len > to->to_resid) {
 			MOD_SUNLOCK;
 			free(buf, M_KSYMS);
 			return (ENXIO);
-		} else
-			to->to_resid -= len;
+		}
+		to->to_resid -= len;
 		KSYMS_EMIT(buf, to->to_symoff, len);
 
 		symtab += nsyms;
@@ -220,14 +220,13 @@ ksyms_add(linker_file_t lf, void *arg)
 	}
 	free(buf, M_KSYMS);
 	MOD_SUNLOCK;
-	
+
 	if (strsz > to->to_resid)
 		return (ENXIO);
-	else
-		to->to_resid -= strsz;
+	to->to_resid -= strsz;
 	KSYMS_EMIT(strtab, to->to_stroff, strsz);
 	to->to_stridx += strsz;
-	
+
 	return (0);
 }
 
@@ -239,16 +238,14 @@ ksyms_add(linker_file_t lf, void *arg)
 static int
 ksyms_snapshot(struct tsizes *ts, vm_offset_t uaddr, size_t resid)
 {
-
 	struct ksyms_hdr *hdr;
-	struct toffsets	 to;
+	struct toffsets	to;
 	int error = 0;
 
-	/* Be kernel stack friendly */
-	hdr = malloc(sizeof (*hdr), M_KSYMS, M_WAITOK|M_ZERO);
+	hdr = malloc(sizeof(*hdr), M_KSYMS, M_WAITOK | M_ZERO);
 
-	/* 
-	 * Create the ELF header. 
+	/*
+	 * Create the ELF header.
 	 */
 	hdr->kh_ehdr.e_ident[EI_PAD] = 0;
 	hdr->kh_ehdr.e_ident[EI_MAG0] = ELFMAG0;
@@ -269,32 +266,32 @@ ksyms_snapshot(struct tsizes *ts, vm_offset_t uaddr, s
 	hdr->kh_ehdr.e_flags = 0;
 	hdr->kh_ehdr.e_ehsize = sizeof(Elf_Ehdr);
 	hdr->kh_ehdr.e_phentsize = sizeof(Elf_Phdr);
-	hdr->kh_ehdr.e_phnum = 2;	/* Text and Data */ 
+	hdr->kh_ehdr.e_phnum = 2;	/* Text and Data */
 	hdr->kh_ehdr.e_shentsize = sizeof(Elf_Shdr);
 	hdr->kh_ehdr.e_shnum = SHDR_NUM;
 	hdr->kh_ehdr.e_shstrndx = SHDR_SHSTRTAB;
 
-	/* 
-	 * Add both the text and data Program headers. 
+	/*
+	 * Add both the text and data program headers.
 	 */
 	hdr->kh_txtphdr.p_type = PT_LOAD;
 	/* XXX - is there a way to put the actual .text addr/size here? */
-	hdr->kh_txtphdr.p_vaddr = 0;  
-	hdr->kh_txtphdr.p_memsz = 0; 
+	hdr->kh_txtphdr.p_vaddr = 0;
+	hdr->kh_txtphdr.p_memsz = 0;
 	hdr->kh_txtphdr.p_flags = PF_R | PF_X;
-    
+
 	hdr->kh_datphdr.p_type = PT_LOAD;
 	/* XXX - is there a way to put the actual .data addr/size here? */
-	hdr->kh_datphdr.p_vaddr = 0; 
-	hdr->kh_datphdr.p_memsz = 0; 
+	hdr->kh_datphdr.p_vaddr = 0;
+	hdr->kh_datphdr.p_memsz = 0;
 	hdr->kh_datphdr.p_flags = PF_R | PF_W | PF_X;
 
-	/* 
-	 * Add the Section headers: null, symtab, strtab, shstrtab, 
+	/*
+	 * Add the section headers: null, symtab, strtab, shstrtab.
 	 */
 
 	/* First section header - null */
-	
+
 	/* Second section header - symtab */
 	hdr->kh_shdr[SHDR_SYMTAB].sh_name = 1; /* String offset (skip null) */
 	hdr->kh_shdr[SHDR_SYMTAB].sh_type = SHT_SYMTAB;
@@ -302,31 +299,31 @@ ksyms_snapshot(struct tsizes *ts, vm_offset_t uaddr, s
 	hdr->kh_shdr[SHDR_SYMTAB].sh_addr = 0;
 	hdr->kh_shdr[SHDR_SYMTAB].sh_offset = sizeof(*hdr);
 	hdr->kh_shdr[SHDR_SYMTAB].sh_size = ts->ts_symsz;
-	hdr->kh_shdr[SHDR_SYMTAB].sh_link = SHDR_STRTAB;	
-	hdr->kh_shdr[SHDR_SYMTAB].sh_info = ts->ts_symsz / sizeof(Elf_Sym); 
+	hdr->kh_shdr[SHDR_SYMTAB].sh_link = SHDR_STRTAB;
+	hdr->kh_shdr[SHDR_SYMTAB].sh_info = ts->ts_symsz / sizeof(Elf_Sym);
 	hdr->kh_shdr[SHDR_SYMTAB].sh_addralign = sizeof(long);
 	hdr->kh_shdr[SHDR_SYMTAB].sh_entsize = sizeof(Elf_Sym);
 
 	/* Third section header - strtab */
-	hdr->kh_shdr[SHDR_STRTAB].sh_name = 1 + sizeof(STR_SYMTAB); 
+	hdr->kh_shdr[SHDR_STRTAB].sh_name = 1 + sizeof(STR_SYMTAB);
 	hdr->kh_shdr[SHDR_STRTAB].sh_type = SHT_STRTAB;
 	hdr->kh_shdr[SHDR_STRTAB].sh_flags = 0;
 	hdr->kh_shdr[SHDR_STRTAB].sh_addr = 0;
-	hdr->kh_shdr[SHDR_STRTAB].sh_offset = 
-	    hdr->kh_shdr[SHDR_SYMTAB].sh_offset + ts->ts_symsz;	
+	hdr->kh_shdr[SHDR_STRTAB].sh_offset =
+	    hdr->kh_shdr[SHDR_SYMTAB].sh_offset + ts->ts_symsz;
 	hdr->kh_shdr[SHDR_STRTAB].sh_size = ts->ts_strsz;
 	hdr->kh_shdr[SHDR_STRTAB].sh_link = 0;
 	hdr->kh_shdr[SHDR_STRTAB].sh_info = 0;
 	hdr->kh_shdr[SHDR_STRTAB].sh_addralign = sizeof(char);
 	hdr->kh_shdr[SHDR_STRTAB].sh_entsize = 0;
-	
+
 	/* Fourth section - shstrtab */
 	hdr->kh_shdr[SHDR_SHSTRTAB].sh_name = 1 + sizeof(STR_SYMTAB) +
 	    sizeof(STR_STRTAB);
 	hdr->kh_shdr[SHDR_SHSTRTAB].sh_type = SHT_STRTAB;
 	hdr->kh_shdr[SHDR_SHSTRTAB].sh_flags = 0;
 	hdr->kh_shdr[SHDR_SHSTRTAB].sh_addr = 0;
-	hdr->kh_shdr[SHDR_SHSTRTAB].sh_offset = 
+	hdr->kh_shdr[SHDR_SHSTRTAB].sh_offset =
 	    offsetof(struct ksyms_hdr, kh_shstrtab);
 	hdr->kh_shdr[SHDR_SHSTRTAB].sh_size = sizeof(ksyms_shstrtab);
 	hdr->kh_shdr[SHDR_SHSTRTAB].sh_link = 0;
@@ -334,9 +331,9 @@ ksyms_snapshot(struct tsizes *ts, vm_offset_t uaddr, s
 	hdr->kh_shdr[SHDR_SHSTRTAB].sh_addralign = 0 /* sizeof(char) */;
 	hdr->kh_shdr[SHDR_SHSTRTAB].sh_entsize = 0;
 
-	/* Copy shstrtab into the header */
+	/* Copy shstrtab into the header. */
 	bcopy(ksyms_shstrtab, hdr->kh_shstrtab, sizeof(ksyms_shstrtab));
-	
+
 	to.to_symoff = uaddr + hdr->kh_shdr[SHDR_SYMTAB].sh_offset;
 	to.to_stroff = uaddr + hdr->kh_shdr[SHDR_STRTAB].sh_offset;
 	to.to_stridx = 0;
@@ -346,13 +343,13 @@ ksyms_snapshot(struct tsizes *ts, vm_offset_t uaddr, s
 	}
 	to.to_resid = resid - sizeof(struct ksyms_hdr);
 
-	/* Emit Header */
+	/* emit header */
 	copyout(hdr, (void *)uaddr, sizeof(struct ksyms_hdr));
-	
+
 	free(hdr, M_KSYMS);
 
-	/* Add symbol and string tables for each kernelmodule */
-	error = linker_file_foreach(ksyms_add, &to); 
+	/* Add symbol and string tables for each kernel module. */
+	error = linker_file_foreach(ksyms_add, &to);
 
 	if (to.to_resid != 0)
 		return (ENXIO);
@@ -365,7 +362,7 @@ ksyms_cdevpriv_dtr(void *data)
 {
 	struct ksyms_softc *sc;
 
-	sc = (struct ksyms_softc *)data; 
+	sc = (struct ksyms_softc *)data;
 
 	mtx_lock(&ksyms_mtx);
 	LIST_REMOVE(sc, sc_list);
@@ -373,19 +370,18 @@ ksyms_cdevpriv_dtr(void *data)
 	free(sc, M_KSYMS);
 }
 
-/* ARGSUSED */
 static int
 ksyms_open(struct cdev *dev, int flags, int fmt __unused, struct thread *td)
 {
 	struct tsizes ts;
+	struct ksyms_softc *sc;
 	size_t total_elf_sz;
 	int error, try;
-	struct ksyms_softc *sc;
-	
-	/* 
-	 *  Limit one open() per process. The process must close()
-	 *  before open()'ing again.
-	 */ 
+
+	/*
+	 * Limit one open() per process. The process must close()
+	 * before open()'ing again.
+	 */
 	mtx_lock(&ksyms_mtx);
 	LIST_FOREACH(sc, &ksyms_list, sc_list) {
 		if (sc->sc_proc == td->td_proc) {
@@ -394,9 +390,7 @@ ksyms_open(struct cdev *dev, int flags, int fmt __unus
 		}
 	}
 
-	sc = (struct ksyms_softc *) malloc(sizeof (*sc), M_KSYMS, 
-	    M_NOWAIT|M_ZERO);
-
+	sc = malloc(sizeof(*sc), M_KSYMS, M_NOWAIT | M_ZERO);
 	if (sc == NULL) {
 		mtx_unlock(&ksyms_mtx);
 		return (ENOMEM);
@@ -407,41 +401,39 @@ ksyms_open(struct cdev *dev, int flags, int fmt __unus
 	mtx_unlock(&ksyms_mtx);
 
 	error = devfs_set_cdevpriv(sc, ksyms_cdevpriv_dtr);
-	if (error) 
+	if (error != 0)
 		goto failed;
 
 	/*
-	 * MOD_SLOCK doesn't work here (because of a lock reversal with 
-	 * KLD_SLOCK).  Therefore, simply try upto 3 times to get a "clean"
+	 * MOD_SLOCK doesn't work here (because of a lock reversal with
+	 * KLD_SLOCK).  Therefore, simply try up to 3 times to get a "clean"
 	 * snapshot of the kernel symbol table.  This should work fine in the
 	 * rare case of a kernel module being loaded/unloaded at the same
-	 * time. 
+	 * time.
 	 */
-	for(try = 0; try < 3; try++) {
+	for (try = 0; try < 3; try++) {
 		/*
-	 	* Map a buffer in the calling process memory space and
-	 	* create a snapshot of the kernel symbol table in it.
-	 	*/
-	
+		 * Map a buffer in the calling process memory space and
+		 * create a snapshot of the kernel symbol table in it.
+		 */
+
 		/* Compute the size of buffer needed. */
 		ksyms_size_calc(&ts);
-		total_elf_sz = sizeof(struct ksyms_hdr) + ts.ts_symsz + 
-			ts.ts_strsz; 
+		total_elf_sz = sizeof(struct ksyms_hdr) + ts.ts_symsz +
+		    ts.ts_strsz;
 
-		error = copyout_map(td, &(sc->sc_uaddr), 
-				(vm_size_t) total_elf_sz);
-		if (error)
+		error = copyout_map(td, &sc->sc_uaddr, (vm_size_t)total_elf_sz);
+		if (error != 0)
 			break;
-		sc->sc_usize = total_elf_sz;	
+		sc->sc_usize = total_elf_sz;
 
-		error = ksyms_snapshot(&ts, sc->sc_uaddr, total_elf_sz); 
-		if (!error)  {
-			/* Successful Snapshot */
-			return (0); 
-		}
-		
-		/* Snapshot failed, unmap the memory and try again */ 
-		(void) copyout_unmap(td, sc->sc_uaddr, sc->sc_usize);
+		error = ksyms_snapshot(&ts, sc->sc_uaddr, total_elf_sz);
+		if (error == 0)
+			/* successful snapshot */
+			return (0);
+
+		/* Snapshot failed, unmap the memory and try again. */
+		(void)copyout_unmap(td, sc->sc_uaddr, sc->sc_usize);
 	}
 
 failed:
@@ -449,30 +441,28 @@ failed:
 	return (error);
 }
 
-/* ARGSUSED */
 static int
 ksyms_read(struct cdev *dev, struct uio *uio, int flags __unused)
 {
-	int error;
-	size_t len, sz;
 	struct ksyms_softc *sc;
-	off_t off;
 	char *buf;
+	off_t off;
+	size_t len, sz;
 	vm_size_t ubase;
-    
+	int error;
+
 	error = devfs_get_cdevpriv((void **)&sc);
-	if (error)
+	if (error != 0)
 		return (error);
-    
+
 	off = uio->uio_offset;
-	len = uio->uio_resid;	
-    
+	len = uio->uio_resid;
+
 	if (off < 0 || off > sc->sc_usize)
 		return (EFAULT);
 
-	if (len > (sc->sc_usize - off))
+	if (len > sc->sc_usize - off)
 		len = sc->sc_usize - off;
-
 	if (len == 0)
 		return (0);
 
@@ -485,16 +475,14 @@ ksyms_read(struct cdev *dev, struct uio *uio, int flag
 	ubase = sc->sc_uaddr + off;
 
 	while (len) {
-
 		sz = min(PAGE_SIZE, len);
-		if (copyin((void *)ubase, buf, sz))
-			error = EFAULT;	
+		if (copyin((void *)ubase, buf, sz) != 0)
+			error = EFAULT;
 		else
 			error = uiomove(buf, sz, uio);
-		
-		if (error)
+		if (error != 0)
 			break;
-	
+
 		len -= sz;
 		ubase += sz;
 	}
@@ -503,27 +491,25 @@ ksyms_read(struct cdev *dev, struct uio *uio, int flag
 	return (error);
 }
 
-/* ARGSUSED */
 static int
 ksyms_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int32_t flag __unused,
     struct thread *td __unused)
 {
-	int error = 0;
 	struct ksyms_softc *sc;
+	int error;
 
 	error = devfs_get_cdevpriv((void **)&sc);
-	if (error)
+	if (error != 0)
 		return (error);
 
 	switch (cmd) {
 	case KIOCGSIZE:
-		/* 
+		/*
 		 * Return the size (in bytes) of the symbol table
 		 * snapshot.
 		 */
 		*(size_t *)data = sc->sc_usize;
 		break;
-		
 	case KIOCGADDR:
 		/*
 		 * Return the address of the symbol table snapshot.
@@ -531,7 +517,6 @@ ksyms_ioctl(struct cdev *dev, u_long cmd, caddr_t data
 		 */
 		*(void **)data = (void *)sc->sc_uaddr;
 		break;
-		
 	default:
 		error = ENOTTY;
 		break;
@@ -540,71 +525,64 @@ ksyms_ioctl(struct cdev *dev, u_long cmd, caddr_t data
 	return (error);
 }
 
-/* ARGUSED */
 static int
 ksyms_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
-		int prot __unused, vm_memattr_t *memattr __unused)
+    int prot __unused, vm_memattr_t *memattr __unused)
 {
-    	struct ksyms_softc *sc;
+	struct ksyms_softc *sc;
 	int error;
 
 	error = devfs_get_cdevpriv((void **)&sc);
-	if (error)
+	if (error != 0)
 		return (error);
 
 	/*
 	 * XXX mmap() will actually map the symbol table into the process
 	 * address space again.
 	 */
-	if (offset > round_page(sc->sc_usize) || 
-	    (*paddr = pmap_extract(sc->sc_pmap, 
-	    (vm_offset_t)sc->sc_uaddr + offset)) == 0) 
+	if (offset > round_page(sc->sc_usize) ||
+	    (*paddr = pmap_extract(sc->sc_pmap,
+	    (vm_offset_t)sc->sc_uaddr + offset)) == 0)
 		return (-1);
 
 	return (0);
 }
 
-/* ARGUSED */
 static int
 ksyms_close(struct cdev *dev, int flags __unused, int fmt __unused,
-		struct thread *td)
+    struct thread *td)
 {
-	int error = 0;
 	struct ksyms_softc *sc;
+	int error;
 	
 	error = devfs_get_cdevpriv((void **)&sc);
-	if (error)
+	if (error != 0)
 		return (error);
 
 	/* Unmap the buffer from the process address space. */
-	error = copyout_unmap(td, sc->sc_uaddr, sc->sc_usize);
-
-	return (error);
+	return (copyout_unmap(td, sc->sc_uaddr, sc->sc_usize));
 }
 
-/* ARGSUSED */
 static int
 ksyms_modevent(module_t mod __unused, int type, void *data __unused)
 {
-	int error = 0;
+	int error;
 
+	error = 0;
 	switch (type) {
 	case MOD_LOAD:
 		mtx_init(&ksyms_mtx, "KSyms mtx", NULL, MTX_DEF);
 		ksyms_dev = make_dev(&ksyms_cdevsw, 0, UID_ROOT, GID_WHEEL,
 		    0400, KSYMS_DNAME);
 		break;
-
 	case MOD_UNLOAD:
 		if (!LIST_EMPTY(&ksyms_list))
 			return (EBUSY);
 		destroy_dev(ksyms_dev);
 		mtx_destroy(&ksyms_mtx);
 		break;
-
 	case MOD_SHUTDOWN:
 		break;
-
 	default:
 		error = EOPNOTSUPP;
 		break;



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