New release s390-tools-2.7.1

Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>

CHANGELOG.md

@@ -1,5 +1,29 @@
 Release history for s390-tools (MIT version)
 --------------------------------------------
+ * __v2.7.1 (2018-12-13)__
+
+  For Linux kernel version: 4.19
+
+  Changes of existing tools:
+  - zkey: Enhance file read/write error handling
+  - cmsfs-fuse: Write more than a single line in linefeed mode
+  - zpcictl: Add warning for unsupported operations
+  - zipl: Use the BLS "title" field as the IPL section name
+
+  Bug Fixes:
+  - cmsfs-fuse: Fix iconv buffer aliasing
+  - cmsfs-fuse: Fix memory leak in cmsfs_rename()
+  - fdasd: Fix possible integer overflow
+  - fdasd: Fix resource leak in fdasd_parse_conffile()
+  - zdev: Fix memory leak in misc_readlink()
+  - dasdinfo: Display error messages on stderr
+  - zkey: Include /sbin into PATH when executing commands
+  - Makefile: Fix parallel build
+  - GCC8 warning fixes across the board for:
+      cmsfs-fuse, dasdinfo, dasdview, dump2tar, fdasd, hmcdrvfs, hyptop,
+      ip_watcher, libvmdump, libvtoc, lsqeth, lszcrypt, qethqoat, zdev, zdsfs,
+      zgetdump, zipl, zpcictl
+
  * __v2.7.0 (2018-10-31)__
 
   For Linux kernel version: 4.19

cmsfs-fuse/cmsfs-fuse.1

@@ -165,7 +165,7 @@ cmsfs-fuse uses a configuration file for automatic translation based on the file
 Upon startup, cmsfs-fuse evaluates the file .cmsfs-fuse/filetypes.conf in the user's home directory. If the file does not
 exist cmsfs-fuse evaluates the file /etc/cmsfs-fuse/filetypes.conf.
 
-The filetypes.conf file contains the CMS file types that are automaticaly translated to ASCII if cmsfs-fuse is started
+The filetypes.conf file contains the CMS file types that are automatically translated to ASCII if cmsfs-fuse is started
 with the -t option. The syntax of the configuration file is one file type per line. Lines that start with a # followed by a space are treated as
 comments and are ignored. The file type is 8 characters long and must consist of valid CMS file name characters only.
 

cmsfs-fuse/cmsfs-fuse.c

@@ -3,7 +3,7 @@
  *
  * Main function
  *
- * Copyright IBM Corp. 2010, 2017
+ * Copyright IBM Corp. 2010, 2018
  *
  * s390-tools is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
@@ -17,6 +17,7 @@
 #include <fuse.h>
 #include <fuse_opt.h>
 #include <iconv.h>
+#include <limits.h>
 #include <linux/fs.h>
 #ifdef HAVE_SETXATTR
 #include <linux/xattr.h>
@@ -36,6 +37,7 @@
 #include <unistd.h>
 
 #include "lib/util_base.h"
+#include "lib/util_libc.h"
 #include "lib/util_list.h"
 #include "lib/zt_common.h"
 
@@ -232,6 +234,8 @@ struct file {
 	int		null_records;
 	/* write cache for text mode */
 	char		*wcache;
+	/* buffer for iconv */
+	char		*iconv_buf;
 	/* used bytes in write cache */
 	int		wcache_used;
 	/* committed written bytes to FUSE */
@@ -601,7 +605,7 @@ static struct file *file_open(const char *name)
 	char uc_name[MAX_FNAME];
 	struct file *f;
 
-	strncpy(uc_name, name, MAX_FNAME);
+	util_strlcpy(uc_name, name, MAX_FNAME);
 	str_toupper(uc_name);
 
 	util_list_iterate(&open_file_list, f)
@@ -923,7 +927,6 @@ static void set_record(struct file *f, int *record, off_t addr, int len,
 static void add_record_ext(struct record *rec, struct record_ext *ext)
 {
 	struct record_ext *tmp;
-	int i = 0;
 
 	if (rec->ext == NULL) {
 		rec->ext = ext;
@@ -931,9 +934,7 @@ static void add_record_ext(struct record *rec, struct record_ext *ext)
 		ext->next = NULL;
 	} else {
 		tmp = rec->ext;
-		i++;
 		while (tmp->next != NULL) {
-			i++;
 			tmp = tmp->next;
 		}
 		tmp->next = ext;
@@ -1567,7 +1568,7 @@ static off_t lookup_file(const char *name, struct fst_entry *fst, int flag)
 	off_t faddr = 0;
 	int rc;
 
-	strncpy(uc_name, name, MAX_FNAME);
+	util_strlcpy(uc_name, name, MAX_FNAME);
 	str_toupper(uc_name);
 
 	if (flag == HIDE_UNLINKED && file_unlinked(uc_name))
@@ -1851,7 +1852,26 @@ static int cmsfs_open(const char *path, struct fuse_file_info *fi)
 		if (f->wcache == NULL)
 			return -ENOMEM;
 
-		strncpy(f->path, path, MAX_FNAME + 1);
+		/*
+		 * For fixed-length records f->fst->record_len contains
+		 * the fixed record length, which will not change. For
+		 * variable-length records it contains the (current) maximum
+		 * record length, which could be increased later by appending
+		 * new records, so use MAX_RECORD_LEN for the iconv buffer.
+		 * The MAX_RECORD_LEN is not valid for fixed-length records,
+		 * only for variable-length records, so use the actual record
+		 * length (f->fst->record_len) for fixed-length records.
+		 */
+		if (f->fst->record_format == RECORD_LEN_FIXED)
+			f->iconv_buf = malloc(f->fst->record_len + 1);
+		else
+			f->iconv_buf = malloc(MAX_RECORD_LEN + 1);
+		if (f->iconv_buf == NULL) {
+			destroy_file_object(f);
+			return -ENOMEM;
+		}
+
+		util_strlcpy(f->path, path, MAX_FNAME + 1);
 		str_toupper(f->path);
 
 		f->use_count = 1;
@@ -2108,7 +2128,7 @@ static int cmsfs_create(const char *path, mode_t mode,
 		return rc;
 
 	/* force uppercase */
-	strncpy(uc_name, path + 1, MAX_FNAME);
+	util_strlcpy(uc_name, path + 1, MAX_FNAME);
 	str_toupper(uc_name);
 
 	rc = encode_edf_name(uc_name, fname, ftype);
@@ -2550,14 +2570,13 @@ static void get_block_data_from_record(struct record *rec, off_t offset,
 	}
 }
 
-static int convert_text(iconv_t conv, char *buf, int size)
+static int convert_text(iconv_t conv, char *in_buf, char *out_buf, int size)
 {
 	size_t out_count = size;
 	size_t in_count = size;
-	char *data_ptr = buf;
 	int rc;
 
-	rc = iconv(conv, &data_ptr, &in_count, &data_ptr, &out_count);
+	rc = iconv(conv, &in_buf, &in_count, &out_buf, &out_count);
 	if ((rc == -1) || (in_count != 0)) {
 		DEBUG("Code page translation EBCDIC-ASCII failed\n");
 		return -EIO;
@@ -2618,14 +2637,15 @@ static int cmsfs_read(const char *path, char *buf, size_t size, off_t offset,
 		/* read one record */
 		if (addr == NULL_BLOCK)
 			memset(buf, 0, chunk);
-		else {
-			rc = _read(buf, chunk, addr);
+		else if (f->translate) {
+			rc = _read(f->iconv_buf, chunk, addr);
 			if (rc < 0)
 				return rc;
-		}
-
-		if (f->translate) {
-			rc = convert_text(cmsfs.iconv_from, buf, chunk);
+			rc = convert_text(cmsfs.iconv_from, f->iconv_buf, buf, chunk);
+			if (rc < 0)
+				return rc;
+		} else {
+			rc = _read(buf, chunk, addr);
 			if (rc < 0)
 				return rc;
 		}
@@ -2757,7 +2777,7 @@ static int delete_file(const char *path)
 		fst_last = find_last_fdir_entry(cmsfs.fdir, cmsfs.dir_levels);
 
 	/* remove unlinked file from fcache */
-	strncpy(file, path + 1, MAX_FNAME);
+	util_strlcpy(file, path + 1, MAX_FNAME);
 	str_toupper(file);
 	invalidate_htab_entry(file);
 
@@ -2841,20 +2861,21 @@ static int cmsfs_rename(const char *path, const char *new_path)
 	str_toupper(uc_new_name);
 
 	rc = encode_edf_name(uc_new_name, fname, ftype);
+	free(uc_new_name);
 	if (rc)
 		return rc;
 
 	memcpy(&fst.name[0], fname, 8);
 	memcpy(&fst.type[0], ftype, 8);
 
-	strncpy(uc_old_name, path + 1, MAX_FNAME);
+	util_strlcpy(uc_old_name, path + 1, MAX_FNAME);
 	str_toupper(uc_old_name);
 	invalidate_htab_entry(uc_old_name);
 
 	/* update name in file object if the file is opened */
 	f = file_open(uc_old_name);
 	if (f != NULL) {
-		strncpy(f->path, new_path, MAX_FNAME + 1);
+		util_strlcpy(f->path, new_path, MAX_FNAME + 1);
 		str_toupper(f->path);
 		memcpy(f->fst->name, fname, 8);
 		memcpy(f->fst->type, ftype, 8);
@@ -3743,7 +3764,7 @@ static int extend_block_variable(struct file *f, const char *buf, int len,
 		}
 
 		DEBUG("%s: wrote %d record bytes\n", __func__, rlen);
-		if (size <= 0)
+		if (size == 0)
 			return copied;
 	}
 
@@ -4167,22 +4188,13 @@ static ssize_t find_newline(const char *buf, int len)
 		return pos - buf;
 }
 
-static int cmsfs_write(const char *path, const char *buf, size_t size,
-		       off_t offset, struct fuse_file_info *fi)
+static int cmsfs_write_strings(struct file *f, const char *buf,
+			       size_t size, off_t offset)
 {
 	int scan_len = MIN(size, (size_t)MAX_RECORD_LEN + 1);
 	int rc, nl_byte = 1, null_record = 0, pad = 0;
-	struct file *f = get_fobj(fi);
 	ssize_t rsize;
 
-	(void) path;
-
-	if (cmsfs.readonly)
-		return -EROFS;
-
-	if (!f->linefeed)
-		return do_write(f, buf, size, offset);
-
 	/* remove already committed bytes */
 	offset -= f->wcache_commited;
 
@@ -4222,7 +4234,7 @@ static int cmsfs_write(const char *path, const char *buf, size_t size,
 	}
 
 	/* translate */
-	rc = convert_text(cmsfs.iconv_to, f->wcache, f->wcache_used);
+	rc = convert_text(cmsfs.iconv_to, f->wcache, f->iconv_buf, f->wcache_used);
 	if (rc < 0)
 		return rc;
 
@@ -4232,6 +4244,7 @@ static int cmsfs_write(const char *path, const char *buf, size_t size,
 	 */
 	if (!f->wcache_used) {
 		*f->wcache = FILLER_EBCDIC;
+		*f->iconv_buf = FILLER_EBCDIC;
 		f->wcache_used = 1;
 		nl_byte = 0;
 		null_record = 1;
@@ -4242,7 +4255,7 @@ static int cmsfs_write(const char *path, const char *buf, size_t size,
 	offset += f->pad_bytes;
 	BUG(offset < 0);
 
-	rc = do_write(f, f->wcache, f->wcache_used, offset);
+	rc = do_write(f, f->iconv_buf, f->wcache_used, offset);
 	if (rc < 0)
 		return rc;
 
@@ -4257,6 +4270,36 @@ static int cmsfs_write(const char *path, const char *buf, size_t size,
 	return rc;
 }
 
+static int cmsfs_write(const char *path, const char *buf, size_t size,
+		       off_t offset, struct fuse_file_info *fi)
+{
+	struct file *f = get_fobj(fi);
+	int rc, written, nbytes;
+
+	(void) path;
+
+	if (cmsfs.readonly)
+		return -EROFS;
+
+	if (!f->linefeed)
+		return do_write(f, buf, size, offset);
+
+	/* Limit the size to what we can report back as written */
+	nbytes = MIN(size, (size_t) INT_MAX);
+
+	written = 0;
+	while (nbytes) {
+		rc = cmsfs_write_strings(f, buf, nbytes, offset);
+		if (rc < 0)
+			return written ? written : rc;
+		written += rc;
+		offset += rc;
+		buf += rc;
+		nbytes -= rc;
+	}
+	return written;
+}
+
 static int cmsfs_unlink(const char *path)
 {
 	struct fst_entry fst;
@@ -4284,7 +4327,7 @@ static int flush_wcache(struct file *f)
 	int rc;
 
 	/* translate */
-	rc = convert_text(cmsfs.iconv_to, f->wcache, f->wcache_used);
+	rc = convert_text(cmsfs.iconv_to, f->wcache, f->iconv_buf, f->wcache_used);
 	if (rc < 0)
 		return rc;
 
@@ -4292,7 +4335,7 @@ static int flush_wcache(struct file *f)
 	offset -= (f->fst->nr_records - f->null_records);
 	BUG(offset < 0);
 
-	rc = do_write(f, f->wcache, f->wcache_used, offset);
+	rc = do_write(f, f->iconv_buf, f->wcache_used, offset);
 	purge_wcache(f);
 	f->null_records = 0;
 	if (rc < 0)
@@ -4415,6 +4458,7 @@ static void destroy_file_object(struct file *f)
 	struct record *rec;
 	int i;
 
+	free(f->iconv_buf);
 	free(f->wcache);
 	free(f->wstate);
 

cmsfs-fuse/config.c

@@ -19,6 +19,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "lib/util_libc.h"
 #include "lib/zt_common.h"
 
 #include "cmsfs-fuse.h"
@@ -65,7 +66,7 @@ static void add_filetype(char *name, struct util_list *list)
 	entry = malloc(sizeof(*entry));
 	if (entry == NULL)
 		DIE_PERROR("malloc failed");
-	strncpy(entry->name, name, MAX_TYPE_LEN);
+	util_strlcpy(entry->name, name, MAX_TYPE_LEN);
 	util_list_add_head(list, entry);
 }
 

common.mak

@@ -6,7 +6,7 @@ COMMON_INCLUDED = true
 # "make DISTRELEASE=%{release}" and "make install DISTRELEASE=%{release}"
 VERSION            = 2
 RELEASE            = 7
-PATCHLEVEL         = 0
+PATCHLEVEL         = 1
 DISTRELEASE        = build-$(shell date +%Y%m%d)
 S390_TOOLS_RELEASE = $(VERSION).$(RELEASE).$(PATCHLEVEL)-$(DISTRELEASE)
 export S390_TOOLS_RELEASE

cpuplugd/config.c

@@ -3,7 +3,7 @@
  *
  * Config file parsing
  *
- * Copyright IBM Corp. 2007, 2017
+ * Copyright IBM Corp. 2007, 2018
  *
  * s390-tools is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
@@ -201,6 +201,7 @@ void parse_configfile(char *file)
 				      linebuffer);
 		parse_configline(linebuffer);
 	}
+	fclose(filp);
 }
 
 /*

dasdinfo/dasdinfo.8

@@ -34,7 +34,7 @@ Print DASD uid
 This option prints the full uid of the DASD. When z/VM provides two
 virtual devices that are actually located on the same real device, the
 first four tokens of the uid will be identical for both devices.  z/VM
-may provide an additional token that allows to distinguish between
+may provide an additional token that can be used to distinguish between
 different minidisks. You need both support in the Linux kernel and
 z/VM to receive such an additional token.
 
@@ -45,7 +45,7 @@ available by applying the PTFs for VM APAR VM64273 on z/VM 5.2.0 and higher.
 .BI "-u|--uid"
 Print DASD uid without z/VM minidisk token
 
-z/VM may provide an additional token that allows to distinguish
+z/VM may provide an additional token that can be used to distinguish
 between different minidisks (see --extended-uid option).  To remain
 compatibile with systems that were installed on older Linux or z/VM
 levels, the -u option will print the uid excluding any z/VM-provided

dasdinfo/dasdinfo.c

@@ -25,6 +25,7 @@
 #include "lib/dasd_base.h"
 #include "lib/util_base.h"
 #include "lib/util_file.h"
+#include "lib/util_libc.h"
 #include "lib/util_opt.h"
 #include "lib/util_prg.h"
 #include "lib/zt_common.h"
@@ -192,18 +193,18 @@ static int dinfo_read_dasd_vlabel(char *device, struct volume_label *vlabel,
 	char *space;
 
 	if (dasd_get_blocksize(device, &blksize) != 0) {
-		printf("Unable to figure out block size.\n");
+		warnx("Unable to figure out block size");
 		goto error;
 	}
 
 	if (dasd_get_info(device, &dasd_info) != 0) {
-		printf("Unable to figure out DASD informations.\n");
+		warnx("Unable to figure out DASD information");
 		goto error;
 	}
 
 	f = open(device, O_RDONLY);
 	if (f < 0) {
-		printf("Could not open device node.\n");
+		warnx("Could not open device node");
 		goto error;
 	}
 
@@ -214,7 +215,7 @@ static int dinfo_read_dasd_vlabel(char *device, struct volume_label *vlabel,
 	bzero(vlabel, vlsize);
 
 	if (read(f, vlabel, vlsize) != vlsize) {
-		printf("Could not read volume label.\n");
+		warnx("Could not read volume label");
 		goto error_close;
 	}
 
@@ -255,10 +256,9 @@ static void *dinfo_malloc(size_t size)
 	void *result;
 
 	result = malloc(size);
-	if (result == NULL) {
-		printf("Could not allocate %lld bytes of memory",
-		       (unsigned long long)size);
-	}
+	if (result == NULL)
+		warnx("Could not allocate %lu bytes of memory", size);
+
 	return result;
 }
 
@@ -318,16 +318,14 @@ static int dinfo_create_devnode(dev_t dev, char **devno)
 			free(result);
 		}
 	}
-	printf("Error: Unable to create temporary device node");
+	warnx("Error: Unable to create temporary device node");
 	return -1;
 }
 
 static void dinfo_free_devnode(char *device)
 {
-	if (remove(device)) {
-		printf("Warning: Could not remove "
-			"temporary file %s", device);
-	}
+	if (remove(device))
+		warnx("Warning: Could not remove temporary file %s", device);
 }
 
 static int dinfo_extract_dev(dev_t *dev, char *str)
@@ -337,10 +335,10 @@ static int dinfo_extract_dev(dev_t *dev, char *str)
 	int ma, mi;
 
 	bzero(tmp, RD_BUFFER_SIZE);
-	strncpy(tmp, str, RD_BUFFER_SIZE);
+	util_strlcpy(tmp, str, RD_BUFFER_SIZE);
 	p = strchr(tmp, ':');
 	if (p == NULL) {
-		printf("Error: unable to extract major/minor\n");
+		warnx("Error: unable to extract major/minor");
 		return -1;
 	}
 
@@ -359,7 +357,7 @@ static int dinfo_get_dev_from_blockdev(char *blockdev, dev_t *dev)
 
 	readbuf = dinfo_malloc(RD_BUFFER_SIZE);
 	if (!readbuf) {
-		printf("Error: Not enough memory to allocate readbuffer\n");
+		warnx("Error: Not enough memory to allocate readbuffer");
 		return -1;
 	}
 	if (util_file_read_line(readbuf, RD_BUFFER_SIZE,
@@ -490,7 +488,7 @@ static int dinfo_get_uid_from_devnode(char **uidfile, char *devnode)
 	int rc = 0;
 
 	if (stat(devnode, &stat_buffer) != 0) {
-		printf("Error: could not stat %s\n", devnode);
+		warnx("Error: could not stat %s", devnode);
 		return -1;
 	}
 
@@ -499,13 +497,13 @@ static int dinfo_get_uid_from_devnode(char **uidfile, char *devnode)
 
 	directory = opendir("/sys/block/");
 	if (directory == NULL) {
-		printf("Error: could not open directory /sys/block\n");
+		warnx("Error: could not open directory /sys/block");
 		return -1;
 	}
 
 	readbuf = dinfo_malloc(RD_BUFFER_SIZE);
 	if (!readbuf) {
-		printf("Error: Not enough memory to allocate readbuffer\n");
+		warnx("Error: Not enough memory to allocate readbuffer");
 		return -1;
 	}
 
@@ -607,25 +605,23 @@ int main(int argc, char *argv[])
 	sscanf(uname_buf.release, "%d.%d", &version, &release);
 	if (strcmp(uname_buf.sysname, "Linux") ||
 	    version < 2 || (version == 2 && release < 6)) {
-		printf("%s %d.%d is not supported\n", uname_buf.sysname,
-		       version, release);
+		warnx("%s %d.%d is not supported", uname_buf.sysname,
+		      version, release);
 		exit(1);
 	}
 
 	if (!busid && !blockdev && !devnode) {
-		printf("Error: please specify a device using either -b, -i "
-		       "or -d\n");
+		warnx("Error: please specify a device using either -b, -i or -d");
 		exit(1);
 	}
 
 	if ((busid && blockdev) || (busid && devnode) || (blockdev && devnode)) {
-		printf("Error: please specify device only once,  either -b, -i "
-		       "or -d\n");
+		warnx("Error: please specify device only once,  either -b, -i or -d");
 		exit(1);
 	}
 
 	if (!print_uid && !print_extended_uid && !print_vlabel) {
-		printf("Error: no action specified (e.g. -u)\n");
+		warnx("Error: no action specified (e.g. -u)");
 		exit(1);
 	}
 
@@ -718,7 +714,7 @@ int main(int argc, char *argv[])
 	}
 
 error:
-	printf("Error: could not read unique DASD ID\n");
+	warnx("Error: could not read unique DASD ID");
 	rc = 1;
 
 out:

dasdview/dasdview.c

@@ -618,7 +618,7 @@ dasdview_print_volser(dasdview_info_t *info)
 		strncpy(volser, vlabel.volid, 6);
 		vtoc_ebcdic_dec(volser, volser, 6);
 	} else {
-		strncpy(volser, "      ", 6);
+		memcpy(volser, "      ", 6);
 	}
 
 	printf("%6.6s\n", volser);

dump2tar/src/tar.c

@@ -78,7 +78,7 @@ static void set_time(char *dest, size_t len, time_t value)
 #define SET_TIME_FIELD(obj, name, value) \
 	set_time((obj)->name, sizeof((obj)->name), (time_t) (value))
 #define SET_STR_FIELD(obj, name, value) \
-	strncpy((obj)->name, (value), sizeof((obj)->name))
+	util_strlcpy((obj)->name, (value), sizeof((obj)->name))
 
 /* Initialize the tar file @header with the provided data */
 static void init_header(struct tar_header *header, const char *filename,

fdasd/fdasd.c

@@ -1,7 +1,7 @@
 /*
  * fdasd - Create or modify partitions on ECKD DASDs
  *
- * Copyright IBM Corp. 2001, 2017
+ * Copyright IBM Corp. 2001, 2018
  *
  * s390-tools is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
@@ -258,7 +258,7 @@ static void fdasd_check_volser(char *volser, int devno)
 {
 	int from, to;
 
-	for (from = 0, to = 0; volser[from] && from < VOLSER_LENGTH; from++)
+	for (from = 0, to = 0; from < VOLSER_LENGTH && volser[from]; from++)
 		if ((volser[from] >= 0x23 &&
 		     volser[from] <= 0x25) || /* # $ % */
 		    (volser[from] >= 0x30 &&
@@ -727,9 +727,9 @@ static int fdasd_parse_conffile(fdasd_anchor_t *anc,
 
 	memset(buffer, 0, sizeof(buffer));
 	rc = read(fd, buffer, sizeof(buffer) - 1);
+	close(fd);
 	if (rc < 0)
 		return -1;
-	close(fd);
 
 	for (i = 0; i < rc; i++)
 		buffer[i] = toupper(buffer[i]);
@@ -1257,7 +1257,7 @@ static void fdasd_write_vtoc_labels(fdasd_anchor_t *anc)
 		printf("DSCBs: ");
 
 	blk = (cchhb2blk(&anc->vlabel->vtoc, &geo) - 1) * anc->blksize;
-	if (blk <= 0)
+	if (cchhb2blk(&anc->vlabel->vtoc, &geo) == 0 || blk == 0)
 		fdasd_error(anc, vlabel_corrupted, "");
 	maxblk = blk + anc->blksize * 9; /* f4+f5+f7+3*f8+3*f9 */
 
@@ -1310,7 +1310,7 @@ static void fdasd_write_vtoc_labels(fdasd_anchor_t *anc)
 			volser[VOLSER_LENGTH] = ' ';
 			strncpy(c1, volser, VOLSER_LENGTH + 1);
 			c1 = strchr(ch, ' ');
-			strncpy(c1, s2, 31);
+			memcpy(c1, s2, 31);
 		} else {
 			if (get_part_type_by_dsname(ch, &part_info->type))
 				part_info->type = PARTITION_NATIVE;
@@ -1321,23 +1321,23 @@ static void fdasd_write_vtoc_labels(fdasd_anchor_t *anc)
 
 			setpos(anc, k, i - 1);
 
-			strncpy(ch, "LINUX.V               "
+			memcpy(ch, "LINUX.V               "
 				"                      ", 44);
 
 			strncpy(volser, anc->vlabel->volid, VOLSER_LENGTH);
 			vtoc_ebcdic_dec(volser, volser, VOLSER_LENGTH);
-			strncpy(c1, volser, VOLSER_LENGTH);
+			memcpy(c1, volser, VOLSER_LENGTH);
 
 			c1 = strchr(ch, ' ');
-			strncpy(c1, ".PART", 5);
+			memcpy(c1, ".PART", 5);
 			c1 += 5;
 
 			sprintf(dsno, "%04d.", k + 1);
-			strncpy(c1, dsno, 5);
+			memcpy(c1, dsno, 5);
 			c1 += 5;
 
 			get_part_dsname_by_type(part_info->type, &dsname);
-			strncpy(c1, dsname, strlen(dsname)); /* We don't want \0 */
+			memcpy(c1, dsname, strlen(dsname)); /* We don't want \0 */
 		}
 		vtoc_ebcdic_enc(ch, ch, 44);
 		if (anc->verbose)
@@ -1636,7 +1636,7 @@ static void fdasd_change_part_type(fdasd_anchor_t *anc)
 
 	ch = strstr(part_info->f1->DS1DSNAM, "PART") + 9;
 	if (ch != NULL)
-		strncpy(ch, str, 6);
+		memcpy(ch, str, 6);
 	vtoc_ebcdic_enc(part_info->f1->DS1DSNAM, part_info->f1->DS1DSNAM, 44);
 	anc->vtoc_changed++;
 }
@@ -1994,7 +1994,7 @@ static int fdasd_check_volume(fdasd_anchor_t *anc)
 			printf(" VOL1\n");
 
 		blk = (cchhb2blk(&vlabel->vtoc, &geo) - 1) * anc->blksize;
-		if (blk > 0) {
+		if (cchhb2blk(&vlabel->vtoc, &geo) > 0 && blk > 0) {
 			rc = fdasd_valid_vtoc_pointer(anc, blk);
 
 			if (anc->print_table && (rc < 0))

hmcdrvfs/Makefile

@@ -31,12 +31,13 @@ LDLIBS += $(FUSE_LDLIBS) -lpthread -lrt -ldl -lm
 
 OBJECTS = hmcdrvfs.o
 
+libs = $(rootdir)/libutil/libutil.a
 
 all: check_dep hmcdrvfs
 
 $(OBJECTS): Makefile
 
-hmcdrvfs: $(OBJECTS)
+hmcdrvfs: $(OBJECTS) $(libs)
 
 install: all install-scripts
 	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 hmcdrvfs \

hmcdrvfs/hmcdrvfs.c

@@ -27,6 +27,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "lib/util_libc.h"
 #include "lib/zt_common.h"
 
 #define HMCDRV_FUSE_LOGNAME	"hmcdrvfs" /* log prefix */
@@ -276,7 +277,7 @@ static void hmcdrv_cache_symlink(struct hmcdrv_fuse_file *fp,
 		fp->symlnk = malloc(HMCDRV_FUSE_MAXPATH);
 
 		if (fp->symlnk != NULL) {
-			strncpy(fp->symlnk, symlink, HMCDRV_FUSE_MAXPATH);
+			util_strlcpy(fp->symlnk, symlink, HMCDRV_FUSE_MAXPATH);
 			fp->symlnk[HMCDRV_FUSE_MAXPATH - 1] = '\0';
 		}
 	}
@@ -483,8 +484,7 @@ static ssize_t hmcdrv_ftp_transfer(struct hmcdrv_fuse_file *fp, char *buf,
 	}
 
 	current_offset += retlen;
-	strncpy(last_ftpcmd, fp->ftpcmd, HMCDRV_FUSE_MAXCMDLEN);
-	last_ftpcmd[HMCDRV_FUSE_MAXCMDLEN - 1] = '\0';
+	util_strlcpy(last_ftpcmd, fp->ftpcmd, HMCDRV_FUSE_MAXCMDLEN);
 	return retlen;
 }
 
@@ -853,13 +853,12 @@ static char *hmcdrv_parse_line(char *line, char *namebuf,
 				*arrow = '\0';
 		}
 
-		strncpy(namebuf, attr.fname, bufsize);
-		namebuf[bufsize - 1] = '\0'; /* safety */
+		util_strlcpy(namebuf, attr.fname, bufsize);
 
 		if (arrow == NULL) {
 			symlink[0] = '\0';
 		} else {
-			strncpy(symlink, arrow + 4, HMCDRV_FUSE_MAXPATH);
+			util_strlcpy(symlink, arrow + 4, HMCDRV_FUSE_MAXPATH);
 			*arrow = ' '; /* restore */
 		}
 
@@ -1148,8 +1147,7 @@ static int hmcdrv_fuse_readlink(const char *path, char *buf, size_t size)
 			if (!S_ISLNK(fp->st.st_mode)) {
 				rc = -EINVAL;
 			} else {
-				strncpy(buf, fp->symlnk, size);
-				buf[size - 1] = '\0';
+				util_strlcpy(buf, fp->symlnk, size);
 			}
 		}
 	}

hyptop/dg_debugfs_lpar.c

@@ -55,8 +55,7 @@ struct l_x_sys_hdr {
 
 static inline void l_sys_hdr__sys_name(struct l_x_sys_hdr *hdr, char *name)
 {
-	memcpy(name, hdr->sys_name, LPAR_NAME_LEN);
-	ht_ebcdic_to_ascii(name, LPAR_NAME_LEN);
+	ht_ebcdic_to_ascii(hdr->sys_name, name, LPAR_NAME_LEN);
 	name[LPAR_NAME_LEN] = 0;
 	ht_strstrip(name);
 }
@@ -176,7 +175,6 @@ static void l_sd_cpu_phys_fill(struct sd_sys *sys,
 		sd_cpu_state_set(cpu, SD_CPU_STATE_UNKNOWN);
 	}
 	sd_cpu_mgm_time_us_set(cpu, cpu_info->mgm_time);
-	sd_cpu_real_type_set(cpu, cpu_type);
 	sd_cpu_commit(cpu);
 }
 

hyptop/dg_debugfs_vm.c

@@ -245,8 +245,7 @@ static void l_sd_sys_root_fill(struct sd_sys *sys)
 		struct sd_sys *guest;
 
 		guest_name[NAME_LEN] = 0;
-		memcpy(guest_name, data->guest_name, NAME_LEN);
-		ht_ebcdic_to_ascii(guest_name, NAME_LEN);
+		ht_ebcdic_to_ascii(data->guest_name, guest_name, NAME_LEN);
 		ht_strstrip(guest_name);
 
 		guest = sd_sys_get(sys, guest_name);

hyptop/helper.c

@@ -98,9 +98,15 @@ void *ht_realloc(void *old_ptr, size_t size)
 /*
  * Convert EBCDIC string to ASCII
  */
-void ht_ebcdic_to_ascii(char *inout, size_t len)
+void ht_ebcdic_to_ascii(char *in, char *out, size_t size)
 {
-	iconv(l_iconv_ebcdic_ascii, &inout, &len, &inout, &len);
+	size_t size_out = size;
+	size_t size_in = size;
+	size_t rc;
+
+	rc = iconv(l_iconv_ebcdic_ascii, &in, &size_in, &out, &size_out);
+	if (rc == (size_t) -1)
+		ERR_EXIT_ERRNO("Code page translation EBCDIC-ASCII failed");
 }
 
 /*

hyptop/helper.h

@@ -17,6 +17,7 @@
 #include <sys/types.h>
 
 #include "lib/util_base.h"
+#include "lib/util_libc.h"
 #include "lib/zt_common.h"
 
 #define G0(x) MAX(0, (s64) (x))
@@ -29,7 +30,7 @@ extern char *ht_strstrip(char *str);
 extern char *ht_strdup(const char *str);
 extern void ht_print_head(const char *sys);
 extern void ht_print_help_icon(void);
-extern void ht_ebcdic_to_ascii(char *inout, size_t len);
+extern void ht_ebcdic_to_ascii(char *in, char *out, size_t len);
 extern char *ht_mount_point_get(const char *fs_type);
 extern u64 ht_ext_tod_2_us(void *tod_ext);
 extern void ht_print_time(void);

hyptop/sd.h

@@ -195,7 +195,6 @@ struct sd_cpu {
 	struct sd_info		i;
 	char			id[9];
 	struct sd_cpu_type	*type;
-	char			real_type[CPU_TYPE_ID_LEN];
 	struct sd_cpu_info	d1;
 	struct sd_cpu_info	d2;
 	struct sd_cpu_info	*d_cur;
@@ -228,11 +227,6 @@ static inline void sd_cpu_state_set(struct sd_cpu *cpu, enum sd_cpu_state state)
 	cpu->state = state;
 }
 
-static inline void sd_cpu_real_type_set(struct sd_cpu *cpu, const char *type)
-{
-	strncpy(cpu->real_type, type, sizeof(cpu->real_type));
-}
-
 static inline void sd_cpu_cpu_time_us_set(struct sd_cpu *cpu, u64 value)
 {
 	cpu->d_cur->cpu_time_us = value;

hyptop/sd_core.c

@@ -219,7 +219,7 @@ struct sd_cpu *sd_cpu_new(struct sd_sys *parent, const char *id,
 
 	cpu = ht_zalloc(sizeof(*cpu));
 	cpu->i.parent = parent;
-	strncpy(cpu->id, id, sizeof(cpu->id));
+	util_strlcpy(cpu->id, id, sizeof(cpu->id));
 	cpu->type = l_cpu_type_by_id(type);
 	cpu->d_cur = &cpu->d1;
 	cpu->cnt = cnt;
@@ -251,7 +251,7 @@ struct sd_sys *sd_sys_new(struct sd_sys *parent, const char *id)
 	struct sd_sys *sys_new;
 
 	sys_new = ht_zalloc(sizeof(*sys_new));
-	strncpy(sys_new->id, id, sizeof(sys_new->id));
+	util_strlcpy(sys_new->id, id, sizeof(sys_new->id));
 	util_list_init(&sys_new->child_list, struct sd_sys, list);
 	util_list_init(&sys_new->cpu_list, struct sd_cpu, list);
 

hyptop/table.c

@@ -47,7 +47,7 @@ static void l_mark_key_add(struct table *t, char *str)
 	struct table_mark_key *key;
 
 	key = ht_zalloc(sizeof(*key));
-	strncpy(key->str, str, sizeof(key->str));
+	util_strlcpy(key->str, str, sizeof(key->str));
 	util_list_add_tail(&t->mark_key_list, key);
 }
 
@@ -617,7 +617,7 @@ void table_row_select_key_get(struct table *t, char str[TABLE_STR_MAX])
 	struct table_row *row;
 
 	row = l_selected_row(t);
-	strncpy(str, row->entries[0].str, TABLE_STR_MAX);
+	util_strlcpy(str, row->entries[0].str, TABLE_STR_MAX);
 }
 
 /*

hyptop/tbox.c

@@ -157,7 +157,7 @@ static void l_print_line(const char *line)
 	char line_cpy[TBOX_MAX_STR + 1];
 	char *ptr_old, *ptr;
 
-	strncpy(line_cpy, line, sizeof(line_cpy));
+	util_strlcpy(line_cpy, line, sizeof(line_cpy));
 	ptr_old = ptr = line_cpy;
 	do {
 		ptr = strchr(ptr, '\\');

hyptop/win_sys.c

@@ -326,7 +326,7 @@ void win_sys_set(const char *sys_id)
 {
 	if (l_initialized)
 		table_reset(l_t);
-	strncpy(l_sys_id, sys_id, sizeof(l_sys_id));
+	util_strlcpy(l_sys_id, sys_id, sizeof(l_sys_id));
 }
 
 /*

include/lib/util_libc.h

@@ -130,6 +130,7 @@ char *util_strcat_realloc(char *str1, const char *str2);
 void util_str_toupper(char *str);
 
 char *util_strstrip(char *s);
+size_t util_strlcpy(char *dest, const char *src, size_t size);
 
 #ifdef __cplusplus
 }

ip_watcher/Makefile

@@ -2,7 +2,9 @@ include ../common.mak
 
 all: xcec-bridge
 
-xcec-bridge: xcec-bridge.o
+libs =	$(rootdir)/libutil/libutil.a
+
+xcec-bridge: xcec-bridge.o $(libs)
 
 clean:
 	rm -f *.o core xcec-bridge

ip_watcher/xcec-bridge.c

@@ -31,6 +31,7 @@
 #include <syslog.h>
 #include <unistd.h>
 
+#include "lib/util_libc.h"
 #include "lib/zt_common.h"
 
 /* a signal causes the interfaces to be re-checked */
@@ -40,7 +41,7 @@
 
 #define UPDATE_SIGNAL SIGUSR1
 
-#define DEV_NAME_LEN IFNAMSIZ
+#define DEV_NAME_SIZE IFNAMSIZ
 
 #define BUFFER_LEN 65536
 
@@ -55,7 +56,7 @@ struct int_sock {
 	int features;
 	int i_fd;
 	int o_fd;
-	char dev_name[DEV_NAME_LEN];
+	char dev_name[DEV_NAME_SIZE];
 	int mtu_warning;
 
 	struct int_sock *next;
@@ -91,7 +92,7 @@ int open_incoming_socket(char *dev_name)
 		return -1;
 	}
 
-	strncpy(if_req.ifr_name,dev_name,DEV_NAME_LEN);
+	util_strlcpy(if_req.ifr_name, dev_name, DEV_NAME_SIZE);
 	retval=ioctl(fd,SIOCGIFINDEX,&if_req);
 	if (retval==-1) {
 		syslog(LOG_ERR,"can't ioctl on raw packet socket, " \
@@ -192,7 +193,7 @@ int open_outgoing_socket(char *dev_name)
 int interface_in_list(struct int_sock *item,struct int_sock *list)
 {
 	for (;list;list=list->next) {
-		if (!strncmp(item->dev_name,list->dev_name,DEV_NAME_LEN)) {
+		if (!strncmp(item->dev_name,list->dev_name,DEV_NAME_SIZE)) {
 			return 1;
 		}
 	}
@@ -281,7 +282,7 @@ int read_sys(struct int_sock **nlist)
 				do_broadcast_bridging=0;
 
 			is->mtu_warning=0;
-			strncpy(is->dev_name, if_name, DEV_NAME_LEN);
+			util_strlcpy(is->dev_name, if_name, DEV_NAME_SIZE);
 			if (!strncmp(if_name,"hsi",3)) {
 				is->features=I_S_FEATURE_PASSTHROUGH;
 			}
@@ -317,7 +318,7 @@ void update_interfaces()
 			prev=NULL;
 			while (j) {
 				if (!strncmp(j->dev_name,i->dev_name,
-					     DEV_NAME_LEN)) {
+					     DEV_NAME_SIZE)) {
 					if (!prev) {
 						select_set.i_s_list=j->next;
 					} else {
@@ -360,7 +361,7 @@ void update_interfaces()
 				continue;
 			}
 
-			strncpy(new_int->dev_name,i->dev_name,DEV_NAME_LEN);
+			util_strlcpy(new_int->dev_name, i->dev_name, DEV_NAME_SIZE);
 			new_int->i_fd=i_fd;
 			new_int->o_fd=o_fd;
 			new_int->features=i->features;

ipl_tools/Makefile

@@ -1,11 +1,15 @@
 include ../common.mak
 
+libs = $(rootdir)/libutil/libutil.a
+
 all: chreipl lsreipl chshut lsshut
 
+libs =	$(rootdir)/libutil/libutil.a
+
 objects = main.o ccw.o fcp.o system.o shutdown.o \
 	  cmd_lsshut.o cmd_chshut.o cmd_lsreipl.o cmd_chreipl.o proc.o
 
-chreipl: $(objects)
+chreipl: $(objects) $(libs)
 	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
 
 lsreipl:

ipl_tools/cmd_chreipl.c

@@ -13,6 +13,7 @@
 #include <ctype.h>
 #include <sys/sysmacros.h>
 
+#include "lib/util_libc.h"
 #include "lib/zt_common.h"
 
 #include "ipl_tools.h"
@@ -182,7 +183,7 @@ static void set_bootprog(const char *bootprog)
 		ERR_EXIT("Bootprog \"%s\" is not a decimal number", bootprog);
 	if (bootprog_int > UINT_MAX)
 		ERR_EXIT("Invalid bootprog specified");
-	strncpy(l.bootprog, bootprog, sizeof(l.bootprog));
+	util_strlcpy(l.bootprog, bootprog, sizeof(l.bootprog));
 	l.bootprog_set = 1;
 }
 
@@ -294,7 +295,7 @@ static int set_reipl_type(const char *dev_name)
 	else
 		return -1;
 
-	strncpy(l.dev, dev_name, sizeof(l.dev));
+	util_strlcpy(l.dev, dev_name, sizeof(l.dev));
 	dev_from_part(l.dev);
 	l.dev_set = 1;
 	return 0;
@@ -302,19 +303,21 @@ static int set_reipl_type(const char *dev_name)
 
 static int get_chreipl_helper_cmd(dev_t dev, char cmd[PATH_MAX])
 {
-	char chreipl_helper[PATH_MAX];
+	char *chreipl_helper;
 	struct proc_dev_entry pde;
 
 	if (proc_dev_get_entry(dev, 1, &pde) != 0)
 		return -1;
-	snprintf(chreipl_helper, PATH_MAX,
-		 "%s/%s.%s", TOOLS_LIBDIR, "chreipl_helper", pde.name);
+	util_asprintf(&chreipl_helper,
+		      "%s/%s.%s", TOOLS_LIBDIR, "chreipl_helper", pde.name);
 	if (access(chreipl_helper, X_OK) != 0) {
 		proc_dev_free_entry(&pde);
+		free(chreipl_helper);
 		return -1;
 	}
 	sprintf(cmd, "%s %d:%d", chreipl_helper, major(dev), minor(dev));
 	proc_dev_free_entry(&pde);
+	free(chreipl_helper);
 	return 0;
 }
 

ipl_tools/fcp.c

@@ -9,6 +9,7 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
+#include "lib/util_libc.h"
 #include "ipl_tools.h"
 
 /*
@@ -30,7 +31,7 @@ int fcp_is_device(const char *devno)
  */
 void fcp_wwpn_get(const char *device, char *wwpn)
 {
-	char path[PATH_MAX], buf[4096];
+	char path[PATH_MAX], buf[20];
 	FILE *fh;
 	int rc;
 
@@ -41,7 +42,7 @@ void fcp_wwpn_get(const char *device, char *wwpn)
 	rc = fscanf(fh, "%s", buf);
 	if (rc <= 0)
 		ERR_EXIT("Could not lookup WWPN \"%s\"", path);
-	strncpy(wwpn, buf, 20);
+	util_strlcpy(wwpn, buf, 20);
 	fclose(fh);
 }
 
@@ -51,7 +52,7 @@ void fcp_wwpn_get(const char *device, char *wwpn)
  */
 void fcp_lun_get(const char *device, char *lun)
 {
-	char path[PATH_MAX], buf[4096];
+	char path[PATH_MAX], buf[20];
 	FILE *fh;
 	int rc;
 
@@ -62,7 +63,7 @@ void fcp_lun_get(const char *device, char *lun)
 	rc = fscanf(fh, "%s", buf);
 	if (rc <= 0)
 		ERR_EXIT("Could not lookup LUN \"%s\"", path);
-	strncpy(lun, buf, 20);
+	util_strlcpy(lun, buf, 20);
 	fclose(fh);
 }
 

ipl_tools/main.c

@@ -9,7 +9,9 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
+#include "lib/util_libc.h"
 #include "lib/zt_common.h"
+
 #include "ipl_tools.h"
 
 struct globals g;
@@ -31,7 +33,7 @@ void __noreturn print_version_exit(void)
 
 int main(int argc, char *argv[])
 {
-	strncpy(g.prog_name, argv[0], sizeof(g.prog_name));
+	util_strlcpy(g.prog_name, argv[0], sizeof(g.prog_name));
 	if (strstr(argv[0], "chreipl") != NULL) {
 		cmd_chreipl(argc, argv);
 		return 0;

ipl_tools/system.c

@@ -9,6 +9,7 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
+#include "lib/util_libc.h"
 #include "ipl_tools.h"
 
 /*
@@ -81,10 +82,11 @@ void read_str(char *string, const char *path, size_t len)
  */
 void read_fw_str(char *string, const char *file, size_t len)
 {
-	char path[PATH_MAX];
+	char *path;
 
-	snprintf(path, sizeof(path), "/sys/firmware/%s", file);
-	return read_str(string, path, len);
+	util_asprintf(&path, "/sys/firmware/%s", file);
+	read_str(string, path, len);
+	free(path);
 }
 
 /*

libdasd/Makefile

@@ -6,7 +6,7 @@ all: $(lib)
 
 objects = dasd_sys.o dasd_ioctl.o
 
-$(lib): $(objects) Makefile
+$(lib): $(objects)
 
 install: all
 

libu2s/Makefile

@@ -4,7 +4,7 @@ lib = libu2s.a
 
 all: $(lib)
 
-objects = u2s.o misc.o
+objects = u2s.o
 
 $(lib): $(objects)
 

libu2s/misc.c

@@ -1,27 +0,0 @@
-/*
- * Misc - Local helper functions
- *
- * Copyright IBM Corp. 2016, 2017
- *
- * s390-tools is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <string.h>
-#include "lib/util_base.h"
-
-/*
- * Helper function that copies a string safely
- */
-size_t misc_strlcpy(char *dest, const char *src, size_t size)
-{
-	size_t str_len = strlen(src);
-	size_t len;
-
-	if (size) {
-		len = MIN(size - 1, str_len);
-		memcpy(dest, src, len);
-		dest[len] = '\0';
-	}
-	return str_len;
-}

libu2s/misc.h

@@ -1,15 +0,0 @@
-/*
- * Misc - Local helper functions
- *
- * Copyright IBM Corp. 2016, 2017
- *
- * s390-tools is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef MISC_H
-#define MISC_H
-
-size_t misc_strlcpy(char *, const char *, size_t);
-
-#endif /* MISC_H */

libu2s/u2s.c

@@ -20,7 +20,7 @@
 #include <wait.h>
 
 #include "lib/u2s.h"
-#include "misc.h"
+#include "lib/util_libc.h"
 
 #define DEV_BUFFER_LENGTH 20
 #define PATH_BUFFER_LENGTH 256
@@ -113,7 +113,7 @@ static int extract_busid(char *name, char *busid) {
 	if (!start)
 		return -1;
 	start++;
-	len = misc_strlcpy(busid, start, BUSIDSIZE);
+	len = util_strlcpy(busid, start, BUSIDSIZE);
 	if (len >= BUSIDSIZE)
 		return -1;
 
@@ -246,7 +246,7 @@ static int find_busid_in_proc(int maja, int mina, char *busid)
 	while (fscanf(filp, "%[^(] %*[^)] ) at ( %d : %d %*[^\n]\n",
 		      bus, &majb, &minb) != EOF) {
 		if ((maja == majb) && (mina == minb)) {
-			len = misc_strlcpy(busid, bus, BUSIDSIZE);
+			len = util_strlcpy(busid, bus, BUSIDSIZE);
 			if (len < BUSIDSIZE)
 				rc = 0;
 			break;

libutil/Makefile

@@ -13,7 +13,8 @@ examples =	util_base_example \
 		util_prg_example \
 		util_rec_example
 
-all: $(lib) $(examples)
+all: $(lib)
+examples: $(lib) $(examples)
 
 objects =	util_base.o \
 		util_path.o \

libutil/util_libc.c

@@ -228,3 +228,30 @@ char *util_strstrip(char *s)
 
 	return s;
 }
+
+/**
+ * Copy \a src to buffer \a dest of size \a size. At most size - 1
+ * chars will be copied. \a dest will always be NUL terminated.
+ *
+ * Note: If the return value is greater than or equal to size truncation
+ * occurred.
+ *
+ * @param[in] dest   Destination buffer
+ * @param[in] src    Source string
+ * @param[in] size   Size of destination buffer
+ *
+ * @returns   strlen Length of \a src string
+ */
+size_t util_strlcpy(char *dest, const char *src, size_t size)
+{
+	size_t str_len = strlen(src);
+	size_t len;
+
+	if (size) {
+		len = MIN(size - 1, str_len);
+		memcpy(dest, src, len);
+		dest[len] = '\0';
+	}
+
+	return str_len;
+}

libvmcp/Makefile

@@ -4,7 +4,8 @@ lib = libvmcp.a
 
 examples = vmcp_example
 
-all: $(lib) $(examples)
+all: $(lib)
+examples: $(lib) $(examples)
 
 objects = vmcp.o
 

libvmdump/dump.h

@@ -35,7 +35,7 @@ public:
 	const char *what(void) const { return msg; }
 	int code(void) const { return errorCode; }
 protected:
-	char msg[200];
+	char msg[2048];
 	int  errorCode;
 };
 

libvmdump/vm_dump.cpp

@@ -98,19 +98,20 @@ VMDump::VMDump(const char *fileName) : Dump(fileName, "rb")
 	dump_read(&adsrRecord,sizeof(adsrRecord),1,fh);
 
 	if(debug) {
+		char buf_asc[1024];
 		char buf[1024];
 		int i;
 
 		fprintf(stderr, "off=%d\n", adsrRecord.sec5_offset);
 		dump_seek(fh, adsrRecord.sec5_offset, SEEK_SET);
 		dump_read(buf, adsrRecord.sec5_len, 1, fh);
-		ebcAsc(buf, adsrRecord.sec5_len);
+		ebcAsc(buf, buf_asc, adsrRecord.sec5_len);
 		for (i=0; i < adsrRecord.sec5_len; i++) {
-			if ((buf[i]==0) || iscntrl(buf[i]))
-				buf[i]=' ';
+			if ((buf_asc[i]==0) || iscntrl(buf_asc[i]))
+				buf_asc[i]=' ';
 		}
-		buf[adsrRecord.sec5_len] = 0;
-		printf("symptom string1: %s\n",buf);
+		buf_asc[adsrRecord.sec5_len] = 0;
+		printf("symptom string1: %s\n",buf_asc);
 	}
 
 	/* Record 2: fmbk */
@@ -142,7 +143,8 @@ struct timeval VMDump::getDumpTime(void) const
 void VMDump::printDebug(void)
 {
 	struct timeval time;
-	char buf[1024];
+	char fmbk_id[8];
+	char albk_id[8];
 
 	s390TodToTimeval(adsrRecord.tod, &time);
 
@@ -165,9 +167,9 @@ void VMDump::printDebug(void)
 
 	/* fmbk */
 
-	ebcAsc(fmbkRecord.id, sizeof(fmbkRecord.id));
-	fmbkRecord.id[7] = 0;
-	printf("id           : %s\n", fmbkRecord.id);
+	ebcAsc(fmbkRecord.id, fmbk_id, sizeof(fmbkRecord.id));
+	fmbk_id[7] = 0;
+	printf("id           : %s\n", fmbk_id);
 	printf("fir    rec nr: %i\n", fmbkRecord.rec_nr_fir);
 	printf("vec    rec nr: %i\n", fmbkRecord.rec_nr_vector);
 	printf("access rec nr: %i\n", fmbkRecord.rec_nr_access);
@@ -175,21 +177,9 @@ void VMDump::printDebug(void)
 
 	/* albk */
 
-	memcpy(buf, albkRecord.id, sizeof(albkRecord.id));
-	ebcAsc(buf, sizeof(albkRecord.id));
-	buf[8]=0;
-	printf("ALBK id      : %s\n",buf);
-
-	/* asibk */
-/*
-  XXX
-	memcpy(buf,asibkRecord.id,sizeof(asibkRecord.id));
-	ebcAsc(buf,sizeof(asibkRecord.id));
-	asibkRecord.id[8]=0;
-	printf("ASIBK id     : %s\n",buf);
-	printf("storage      : %x\n",asibkRecord.storage_size_2GB);
-	printf("bitmapsrecs  : %i\n",asibkRecord.nr_of_recs_of_first_bit_map);
-*/
+	ebcAsc(albkRecord.id, albk_id, sizeof(albkRecord.id));
+	albk_id[7]=0;
+	printf("ALBK id      : %s\n",albk_id);
 }
 
 void VMDump::printInfo(void)

libvmdump/vm_dump.h

@@ -140,9 +140,15 @@ protected:
 	} __packed;
 
 	/* Methods */
-	inline void ebcAsc(char *inout, size_t len) const
+	inline void ebcAsc(char *in, char *out, size_t size) const
 	{
-		iconv(ebcdicAsciiConv, &inout, &len, &inout, &len);
+		size_t size_out = size;
+		size_t size_in = size;
+		size_t rc;
+
+		rc = iconv(ebcdicAsciiConv, &in, &size_in, &out, &size_out);
+		if (rc == (size_t) -1)
+			throw(DumpException("Code page translation EBCDIC-ASCII failed"));
 	}
 
 	/* Members */

libvtoc/vtoc.c

@@ -398,7 +398,7 @@ void vtoc_volume_label_set_volser (volume_label_t *vlabel, char *volser)
 
 	strcpy(s, "      ");
 	vtoc_ebcdic_enc(s, s, VOLSER_LENGTH);
-	strncpy(vlabel->volid, s, VOLSER_LENGTH);
+	memcpy(vlabel->volid, s, VOLSER_LENGTH);
 
 	if (i > VOLSER_LENGTH) i = VOLSER_LENGTH;
 
@@ -743,8 +743,8 @@ static void vtoc_init_format_1_8_label (
 	bzero(f1->DS1DSNAM, sizeof(f1->DS1DSNAM));
 	sprintf(str, "PART    .NEW                                ");
 	vtoc_ebcdic_enc(str, str, 44);
-	strncpy(f1->DS1DSNAM, str, 44);
-	strncpy((char *) f1->DS1DSSN, "      ", 6);
+	memcpy(f1->DS1DSNAM, str, 44);
+	memcpy((char *) f1->DS1DSSN, "      ", 6);
 	f1->DS1VOLSQ = 0x0001;
 
 	vtoc_set_date(&f1->DS1CREDT,
@@ -758,7 +758,7 @@ static void vtoc_init_format_1_8_label (
 	f1->DS1NOBDB = 0x00;
 	f1->DS1FLAG1 = 0x00;
 	vtoc_ebcdic_enc("IBM LINUX    ", str, 13);
-	strncpy((char *)f1->DS1SYSCD, str, 13);
+	memcpy((char *)f1->DS1SYSCD, str, 13);
 	vtoc_set_date(&f1->DS1REFD,
 		      (u_int8_t) creatime->tm_year,
 		      (u_int16_t) creatime->tm_yday);

qethconf/qethconf.8

@@ -58,7 +58,7 @@ e.g. \-xc0a80a26
 .TP 
 \fIMASKBITS\fR 
 Number of bits set in the network mask. 
-This allows to specify an address range, e.g. 192.168.10.0/24. 
+Network masks can be used to specify address ranges, e.g. 192.168.10.0/24.
 This subparameter is only valid for function IPA.
 .TP 
 \fIINTERFACE\fR

qethqoat/Makefile

@@ -2,7 +2,9 @@ include ../common.mak
 
 all: qethqoat
 
-qethqoat: qethqoat.o
+libs = $(rootdir)/libutil/libutil.a
+
+qethqoat: qethqoat.o $(libs)
 
 install: all
 	$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man8

qethqoat/qethqoat.c

@@ -24,6 +24,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "lib/util_libc.h"
 #include "lib/zt_common.h"
 #include "qethqoat.h"
 
@@ -46,9 +47,15 @@ static int mac_is_zero(__u8 *mac)
 	return !(mac[0] | mac[1] | mac[2] | mac[3] | mac[4] | mac[5]);
 }
 
-static void ebctoasc(char *inout, size_t len)
+static void ebctoasc(char *in, char *out, size_t size)
 {
-	iconv(l_iconv_ebcdic_ascii, &inout, &len, &inout, &len);
+	size_t size_out = size;
+	size_t size_in = size;
+	size_t rc;
+
+	rc = iconv(l_iconv_ebcdic_ascii, &in, &size_in, &out, &size_out);
+	if (rc == (size_t) -1)
+		fprintf(stderr, "Code page translation EBCDIC-ASCII failed\n");
 }
 
 static void print_version()
@@ -287,6 +294,7 @@ static void print_logical(struct qeth_qoat_logical *lhdr)
 	char prouter[] = "primary";
 	char srouter[] = "secondary";
 	char nrouter[] = "no";
+	char port_name[8];
 	char *router;
 
 	if (lhdr->ip4_primary_router)
@@ -340,8 +348,8 @@ static void print_logical(struct qeth_qoat_logical *lhdr)
 
 
 	if (lhdr->port_name_f) {
-		ebctoasc((char *)lhdr->port_name, 8);
-		printf("Port name: %.8s\n", lhdr->port_name);
+		ebctoasc((char *)lhdr->port_name, port_name, 8);
+		printf("Port name: %.8s\n", port_name);
 	}
 
 	printf("IPv4 assists enabled: 0x%08x\n", lhdr->ip4_ass_enabled);
@@ -541,6 +549,7 @@ int main(int argc, char **argv)
 	opts.raw = 0;
 	opts.scope = 1;
 	opts.file = NULL;
+	opts.ifname = NULL;
 
 	while ((c = getopt_long(argc, argv, qethqoat_opts_str, qethqoat_opts,
 		&index)) != -1) {
@@ -613,7 +622,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	strncpy(ifr.ifr_name, opts.ifname, IFNAMSIZ);
+	util_strlcpy(ifr.ifr_name, opts.ifname, IFNAMSIZ);
 	oat_data.command = opts.scope;
 	ifr.ifr_ifru.ifru_data = (void *)&oat_data;
 

scripts/zipl-switch-to-blscfg

@@ -150,6 +150,7 @@ while IFS='= ' read key val; do
             if [ -f "${OUTPUT}" ]; then
                 print_error "BLS file ${OUTPUT} already exists"
             fi
+            echo "title $section" >> ${OUTPUT}
         fi
     elif [[ $val ]]; then
         val="$(echo $val | sed -e 's/^[ \t"]*//;s/[ \t"]*$//')"

vmur/vmur.8

@@ -21,7 +21,7 @@ vmur \- Work with z/VM spool file queues
 .
 .
 .SH DESCRIPTION
-The \*v program allows to read, create, list, purge, or order files
+With the \*v program you can read, create, list, purge, or order files
 on the z/VM spool files queues (RDR, PUN, and PRT).
 
 \*v supports the following commands:

zconf/qeth/lsqeth.c

@@ -168,7 +168,7 @@ static void ethtool_checksumming(char *buf, const char *if_name)
 	fd = socket(AF_INET, SOCK_DGRAM, 0);
 	if (fd < 0)
 		errx(EXIT_FAILURE, "Internal error: cannot get SOCK_DGRAM socket");
-	strncpy(ifr.ifr_name, if_name, IFNAMSIZ);
+	util_strlcpy(ifr.ifr_name, if_name, IFNAMSIZ);
 	val.cmd = ETHTOOL_GRXCSUM;
 	ifr.ifr_data = (void *)&val;
 	rc = ioctl(fd, SIOCETHTOOL, &ifr);

zconf/zcrypt/lszcrypt.c

@@ -12,6 +12,7 @@
 
 #include "lib/util_base.h"
 #include "lib/util_file.h"
+#include "lib/util_libc.h"
 #include "lib/util_opt.h"
 #include "lib/util_panic.h"
 #include "lib/util_path.h"
@@ -620,7 +621,7 @@ static void show_devices_argv(char *argv[])
 {
 	struct util_rec *rec = util_rec_new_wide("-");
 	struct dirent **dev_vec, **subdev_vec;
-	char *ap, *grp_dev, *path, card[16], sub_dev[16];
+	char *ap, *grp_dev, *path, *card, *sub_dev;
 	int id, dom, i, n, dev_cnt, sub_cnt;
 
 	/* check if ap driver is available */
@@ -639,14 +640,16 @@ static void show_devices_argv(char *argv[])
 		if (sscanf(argv[i], "%x.%x", &id, &dom) >= 1) {
 			/* at least the id field was valid */
 			if (id >= 0 && dom >= 0) {	/* single subdevice */
-				sprintf(sub_dev, "%02x.%04x", id, dom);
+				util_asprintf(&sub_dev, "%02x.%04x", id, dom);
 				grp_dev = util_path_sysfs("devices/ap/card%02x",
 							  id);
 				show_subdevice(rec, grp_dev, sub_dev);
 				free(grp_dev);
+				free(sub_dev);
 			} else {			/* group device */
-				sprintf(card, "card%02x", id);
+				util_asprintf(&card, "card%02x", id);
 				show_device(rec, card);
+				free(card);
 			}
 			return;
 		}

zdev/include/nic.h

@@ -24,14 +24,14 @@ enum nic_target {
 	nic_lan,
 };
 
-#define NIC_OWNER_LEN	9
-#define NIC_NAME_LEN	9
+#define NIC_OWNER_SIZE	9
+#define NIC_NAME_SIZE	9
 
 struct nic_data {
 	enum nic_type type;
 	enum nic_target target;
-	char owner[NIC_OWNER_LEN];
-	char name[NIC_NAME_LEN];
+	char owner[NIC_OWNER_SIZE];
+	char name[NIC_NAME_SIZE];
 };
 
 bool nic_data_get(const char *, struct nic_data *);

zdev/src/misc.c

@@ -1,7 +1,7 @@
 /*
  * zdev - Modify and display the persistent configuration of devices
  *
- * Copyright IBM Corp. 2016, 2017
+ * Copyright IBM Corp. 2016, 2018
  *
  * s390-tools is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
@@ -1091,7 +1091,7 @@ exit_code_t misc_write_text_file_retry(const char *path, const char *text,
  * at the specified path or NULL on error. */
 char *misc_readlink(const char *path)
 {
-	char *name;
+	char *name, *name2;
 	ssize_t len;
 
 	debug("Reading link %s\n", path);
@@ -1103,7 +1103,8 @@ char *misc_readlink(const char *path)
 	}
 	name[len++] = 0;
 
-	return realloc(name, len);
+	name2 = realloc(name, len);
+	return (name2) ? name2 : name;
 }
 
 /* Determine configuration set. */

zdev/src/nic.c

@@ -10,6 +10,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "lib/util_libc.h"
+
 #include "misc.h"
 #include "nic.h"
 #include "path.h"
@@ -55,8 +57,8 @@ bool nic_data_get(const char *id, struct nic_data *data_ptr)
 	else
 		goto out;
 
-	strncpy(data.owner, argv[11], sizeof(data.owner));
-	strncpy(data.name, argv[12], sizeof(data.name));
+	util_strlcpy(data.owner, argv[11], NIC_OWNER_SIZE);
+	util_strlcpy(data.name, argv[12], NIC_NAME_SIZE);
 
 	result = true;
 	*data_ptr = data;

zdev/src/setting.c

@@ -1,7 +1,7 @@
 /*
  * zdev - Modify and display the persistent configuration of devices
  *
- * Copyright IBM Corp. 2016, 2017
+ * Copyright IBM Corp. 2016, 2018
  *
  * s390-tools is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
@@ -550,7 +550,7 @@ void setting_list_merge(struct setting_list *to, struct setting_list *from,
 		if (specified)
 			n->specified = s->specified;
 		if (modified)
-			n->modified = n->modified;
+			n->modified = s->modified;
 	}
 }
 

zdsfs/zdsfs.c

@@ -27,6 +27,7 @@
 #endif
 
 #include "lib/libzds.h"
+#include "lib/util_libc.h"
 #include "lib/zt_common.h"
 
 #define COMP "zdsfs: "
@@ -75,11 +76,10 @@ static void path_to_ds_name(const char *path, char *normds, size_t size)
 
 	if (*path == '/')
 		++path;
-	strncpy(normds, path, size);
-	normds[size - 1] = 0;
+	util_strlcpy(normds, path, size);
 	end = strchr(normds, '/');
 	if (end)
-		*end = 0;
+		*end = '\0';
 }
 
 static void path_to_member_name(const char *path, char *normds, size_t size)
@@ -88,11 +88,10 @@ static void path_to_member_name(const char *path, char *normds, size_t size)
 		++path;
 	path = strchr(path, '/');
 	if (!path)
-		normds[0] = 0;
+		normds[0] = '\0';
 	else {
 		++path;
-		strncpy(normds, path, size);
-		normds[size - 1] = 0;
+		util_strlcpy(normds, path, size);
 	}
 }
 

zdump/dfi_s390mv.c

@@ -10,6 +10,7 @@
  */
 
 #include <dirent.h>
+#include <err.h>
 #include <fcntl.h>
 #include <linux/fs.h>
 #include <stdio.h>
@@ -20,6 +21,8 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "lib/util_path.h"
+
 #include "zgetdump.h"
 #include "dfi_s390mv.h"
 
@@ -102,19 +105,25 @@ static void em_init(struct vol *vol)
  */
 static enum dev_status dev_from_busid(char *bus_id, dev_t *dev)
 {
-	char tmp_file[PATH_MAX], dev_file[PATH_MAX];
 	struct dirent *direntp;
 	int fh, minor, major;
 	char buf[10];
 	DIR *fh_dir;
+	char *sysfs;
 
-	snprintf(dev_file, PATH_MAX, "%s/%s", SYSFS_BUSDIR, bus_id);
-	fh_dir = opendir(dev_file);
+	sysfs = util_path_sysfs("%s/%s", SYSFS_BUSDIR, bus_id);
+	fh_dir = opendir(sysfs);
+	free(sysfs);
 	if (!fh_dir)
 		return DEV_UNDEFINED;
 
-	snprintf(tmp_file, PATH_MAX, "%s/online", dev_file);
-	fh = open(tmp_file, O_RDONLY);
+	sysfs = util_path_sysfs("%s/%s/online", SYSFS_BUSDIR, bus_id);
+	fh = open(sysfs, O_RDONLY);
+	if (fh == -1) {
+		warnx("Could not open \"%s\" (%s)", sysfs, strerror(errno));
+		goto err;
+	}
+	free(sysfs);
 	if (read(fh, buf, 1) == -1)
 		ERR_EXIT_ERRNO("Could not read online attribute");
 	close(fh);
@@ -128,27 +137,49 @@ static enum dev_status dev_from_busid(char *bus_id, dev_t *dev)
 	closedir(fh_dir);
 
 	if (direntp == NULL) {
-		snprintf(dev_file, PATH_MAX, "%s/%s/block", SYSFS_BUSDIR,
-			 bus_id);
-		fh_dir = opendir(dev_file);
-		if (!fh_dir)
-			ERR_EXIT_ERRNO("Could not open \"%s\"", dev_file);
+		sysfs = util_path_sysfs("%s/%s/block", SYSFS_BUSDIR, bus_id);
+		fh_dir = opendir(sysfs);
+		if (!fh_dir) {
+			warnx("Could not open \"%s\" (%s) ",
+			      sysfs, strerror(errno));
+			goto err;
+		}
 		while ((direntp = readdir(fh_dir)))
 			if (strncmp(direntp->d_name, "dasd", 4) == 0)
 				break;
 		closedir(fh_dir);
-		if (direntp == NULL)
-			ERR_EXIT("Problem with contents of \"%s\"", dev_file);
+		if (direntp == NULL) {
+			warnx("Problem with contents of \"%s\"", sysfs);
+			goto err;
+		}
+		free(sysfs);
+	}
+
+	sysfs = util_path_sysfs("%s/%s/%s/dev",
+				SYSFS_BUSDIR, bus_id, direntp->d_name);
+	fh = open(sysfs, O_RDONLY);
+	if (fh == -1) {
+		warnx("Could not open \"%s\" (%s)", sysfs, strerror(errno));
+		goto err;
+	}
+	if (read(fh, buf, sizeof(buf)) == -1) {
+		warnx("Could not read dev file (%s)", strerror(errno));
+		goto err;
 	}
-	snprintf(tmp_file, PATH_MAX, "%s/%s/dev", dev_file, direntp->d_name);
-	fh = open(tmp_file, O_RDONLY);
-	if (read(fh, buf, sizeof(buf)) == -1)
-		ERR_EXIT_ERRNO("Could not read dev file");
 	close(fh);
-	if (sscanf(buf, "%i:%i", &major, &minor) != 2)
-		ERR_EXIT("Malformed content of \"%s\": %s", tmp_file, buf);
+	if (sscanf(buf, "%i:%i", &major, &minor) != 2) {
+		warnx("Malformed content of \"%s\": %s", sysfs, buf);
+		goto err;
+	}
 	*dev = makedev(major, minor);
+
+	free(sysfs);
+
 	return DEV_ONLINE;
+
+err:
+	free(sysfs);
+	exit(EXIT_FAILURE);
 }
 
 /*
@@ -467,19 +498,6 @@ fail:
 	return rc;
 }
 
-/*
- * Check if sysfs is available
- */
-static void check_sysfs(void)
-{
-	DIR *fh_dir;
-
-	fh_dir = opendir(SYSFS_BUSDIR);
-	if (!fh_dir)
-		ERR_EXIT_ERRNO("Could not open %s\n", SYSFS_BUSDIR);
-	closedir(fh_dir);
-}
-
 /*
  * Read dump tool from DASD and check if we have a multi-volume dump tool
  */
@@ -503,8 +521,6 @@ static void volumes_init(void)
 	u64 mem_off = 0;
 	unsigned int i;
 
-	check_sysfs();
-
 	for (i = 0; i < l.table.vol_cnt; i++) {
 		l.vol_vec[i].nr = i;
 		vol_init(&l.vol_vec[i], &l.table.vol_parm[i], l.table.ssid[i],
@@ -552,10 +568,10 @@ static void set_magic_numbers(void)
 {
 	if (l.extended) {
 		l.magic_number = DF_S390_MAGIC_EXT;
-		strncpy(l.dumper_magic, DF_S390_DUMPER_MAGIC_MV_EXT, 7);
+		memcpy(l.dumper_magic, DF_S390_DUMPER_MAGIC_MV_EXT, 7);
 	} else {
 		l.magic_number = DF_S390_MAGIC;
-		strncpy(l.dumper_magic, DF_S390_DUMPER_MAGIC_MV, 7);
+		memcpy(l.dumper_magic, DF_S390_DUMPER_MAGIC_MV, 7);
 	}
 }
 

zdump/dfi_s390mv.h

@@ -13,7 +13,7 @@
 
 #include "lib/zt_common.h"
 
-#define SYSFS_BUSDIR	"/sys/bus/ccw/devices"
+#define SYSFS_BUSDIR	"bus/ccw/devices"
 #define MAX_VOLUMES	32
 
 /*

zdump/opts.c

@@ -167,7 +167,7 @@ static void argv_fuse_set(char **argv, int argc)
 static void action_set(enum zg_action action)
 {
 	if (g.opts.action_specified)
-		ERR_EXIT("Please specifiy only one of the \"-i\", \"-d\", "
+		ERR_EXIT("Please specify only one of the \"-i\", \"-d\", "
 			 "\"-m\" or \"-u\" option");
 	g.opts.action = action;
 	g.opts.action_specified = 1;
@@ -183,7 +183,7 @@ static void verify_opts(void)
 		    g.opts.action != ZG_ACTION_STDOUT &&
 		    g.opts.action != ZG_ACTION_DUMP_INFO)
 			ERR_EXIT("The \"--select\" option can only be "
-				 "specifed for info, mount, or copy");
+				 "specified for info, mount, or copy");
 	}
 	if (!g.opts.fmt_specified)
 		return;

zipl/boot/menu.c

@@ -3,7 +3,7 @@
  *
  * Bootmenu Subroutines
  *
- * Copyright IBM Corp. 2013, 2017
+ * Copyright IBM Corp. 2013, 2018
  *
  * s390-tools is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
@@ -123,7 +123,7 @@ static int menu_param(unsigned long *value)
 	/* no number, check for keyword */
 	i = 0;
 	/* skip leading whitespaces */
-	while (ebc_isspace(loadparm[i]) && (i < PARAM_SIZE))
+	while ((i < PARAM_SIZE) && ebc_isspace(loadparm[i]))
 		i++;
 
 	if (!strncmp(&loadparm[i], "PROMPT", 6)) {

zipl/boot/s390.h

@@ -190,7 +190,7 @@ struct _lowcore {
 
 	/* align to the top of the prefix area */
 	uint8_t	pad_0x1900[0x2000-0x1900];	/* 0x1900 */
-} __packed;
+} __packed __aligned(8192);
 
 #define S390_lowcore (*((struct _lowcore *) 0))
 

zipl/boot/stage3.c

@@ -3,7 +3,7 @@
  *
  * Main program for stage3 bootloader
  *
- * Copyright IBM Corp. 2013, 2017
+ * Copyright IBM Corp. 2013, 2018
  *
  * s390-tools is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
@@ -257,7 +257,7 @@ void start(void)
 		length++;
 
 	/* find end of original parm line */
-	while (command_line[end] != 0 && command_line[end] != 0)
+	while (command_line[end] != 0)
 		end++;
 
 	/*

zipl/man/zipl.8

@@ -59,9 +59,9 @@ tool implements a boot menu which includes the following features:
 .IP "     -"
 display a list of available configurations
 .IP "     -"
-allow to choose a configuration
+choose a configuration
 .IP "     -"
-allow to specify additional kernel command line parameters
+specify additional kernel command line parameters
 .PP
 
 See the

zipl/src/Makefile

@@ -7,8 +7,8 @@ ALL_CPPFLAGS += -I../include -I../boot \
 	    -D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
 ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
 
-libs =	$(rootdir)/libutil/libutil.a \
-	$(rootdir)/libu2s/libu2s.a
+libs =	$(rootdir)/libu2s/libu2s.a \
+	$(rootdir)/libutil/libutil.a
 
 objects = misc.o error.o scan.o job.o boot.o bootmap.o disk.o \
 	  install.o zipl.o $(rootdir)/zipl/boot/data.o

zipl/src/boot.c

@@ -117,7 +117,7 @@ boot_init_fba_stage0(struct boot_fba_stage0 *stage0,
 	blocknum_t i;
 
 	/* Initialize stage 0 data */
-	memcpy(stage0, DATA_ADDR(fba0), sizeof(*stage0));
+	memcpy(stage0, DATA_ADDR(fba0), DATA_SIZE(fba0));
 	/* Fill in blocklist for stage 2 loader */
 	if (stage1b_count > STAGE1B_BLK_CNT_MAX) {
 		error_reason("Not enough room for FBA stage 1b loader");
@@ -137,7 +137,7 @@ boot_init_fba_stage0(struct boot_fba_stage0 *stage0,
 void
 boot_init_eckd_ldl_stage0(struct boot_eckd_ldl_stage0 *stage0)
 {
-	memcpy(stage0, DATA_ADDR(eckd0_ldl), sizeof(*stage0));
+	memcpy(stage0, DATA_ADDR(eckd0_ldl), DATA_SIZE(eckd0_ldl));
 	/* Fill in size of stage 1 plus stage 0 loader */
 	stage0->read_r1.count = sizeof(struct boot_eckd_stage1) +
 		sizeof(struct boot_eckd_ldl_stage0);
@@ -146,7 +146,7 @@ boot_init_eckd_ldl_stage0(struct boot_eckd_ldl_stage0 *stage0)
 void
 boot_init_eckd_cdl_stage0(struct boot_eckd_cdl_stage0 *stage0)
 {
-	memcpy(stage0, DATA_ADDR(eckd0_cdl), sizeof(*stage0));
+	memcpy(stage0, DATA_ADDR(eckd0_cdl), DATA_SIZE(eckd0_cdl));
 	/* Fill in size of stage 1 loader */
 	stage0->read.count = sizeof(struct boot_eckd_stage1);
 }
@@ -157,7 +157,7 @@ boot_init_eckd_stage1(struct boot_eckd_stage1 *stage1,
 {
 	blocknum_t i;
 
-	memcpy(stage1, DATA_ADDR(eckd1), sizeof(*stage1));
+	memcpy(stage1, DATA_ADDR(eckd1), DATA_SIZE(eckd1));
 	/* Fill in blocklist for stage 1b  loader */
 	if (stage1b_count > STAGE1B_BLK_CNT_MAX) {
 		error_reason("Not enough room for ECKD stage 1b loader "
@@ -185,7 +185,7 @@ boot_init_fba_stage1b(struct boot_fba_stage1b *stage1b,
 {
 	blocknum_t i;
 
-	memcpy(stage1b, DATA_ADDR(fba1b), sizeof(*stage1b));
+	memcpy(stage1b, DATA_ADDR(fba1b), DATA_SIZE(fba1b));
 	if (stage2_count > STAGE2_BLK_CNT_MAX) {
 		error_reason("Not enough room for FBA stage 2 loader");
 		return -1;
@@ -207,7 +207,7 @@ boot_init_eckd_stage1b(struct boot_eckd_stage1b *stage1b,
 {
 	blocknum_t i;
 
-	memcpy(stage1b, DATA_ADDR(eckd1b), sizeof(*stage1b));
+	memcpy(stage1b, DATA_ADDR(eckd1b), DATA_SIZE(eckd1b));
 	if (stage2_count > STAGE2_BLK_CNT_MAX) {
 		error_reason("Not enough room for ECKD stage 2 loader "
 			     "(try larger block size)");

zipl/src/disk.c

@@ -198,8 +198,8 @@ disk_get_info(const char* device, struct job_target_data* target,
 	long devsize;
 	FILE *fh;
 	char *script_pre = TOOLS_LIBDIR "/zipl_helper.";
-	char script_file[80];
-	char ppn_cmd[80];
+	char *script_file;
+	char *ppn_cmd;
 	char buffer[80];
 	char value[40];
 	int majnum, minnum;
@@ -235,23 +235,22 @@ disk_get_info(const char* device, struct job_target_data* target,
 	}
 	data->source = source_user;
 	/* Check if targetbase script is available */
-	strcpy(script_file, script_pre);
-	if (data->drv_name) {
-		strcat(script_file, data->drv_name);
-	}
+	if (data->drv_name)
+		misc_asprintf(&script_file, "%s%s", script_pre, data->drv_name);
+	else
+		misc_asprintf(&script_file, "%s", script_pre);
 	if ((target->targetbase == NULL) &&
 	    (!stat(script_file, &script_stats))) {
 		data->source = source_script;
 		/* Run targetbase script */
-		strcpy(ppn_cmd, script_file);
 		if (target->bootmap_dir == NULL) {
 			/* happens in case of partition dump */
-			snprintf(ppn_cmd, sizeof(ppn_cmd), "%s %d:%d",
-				 script_file, major(stats.st_rdev),
-				 minor(stats.st_rdev));
+			misc_asprintf(&ppn_cmd, "%s %d:%d",
+				      script_file, major(stats.st_rdev),
+				      minor(stats.st_rdev));
 		} else {
-			strcat(ppn_cmd, " ");
-			strcat(ppn_cmd, target->bootmap_dir);
+			misc_asprintf(&ppn_cmd, "%s %s",
+				      script_file, target->bootmap_dir);
 		}
 		printf("Run %s\n", ppn_cmd);
 		fh = popen(ppn_cmd, "r");
@@ -447,6 +446,7 @@ type_determined:
 	return 0;
 out_close:
 	close(fd);
+	free(ppn_cmd);
 	free(data);
 	return -1;
 

zipl/src/scan.c

@@ -701,7 +701,7 @@ scan_bls_field(struct misc_file_buffer *file, struct scan_token* scan,
 	file->buffer[key_end] = '\0';
 	file->buffer[val_end] = '\0';
 
-	if (strncmp("version", &file->buffer[key_start], key_end - key_start) == 0) {
+	if (strncmp("title", &file->buffer[key_start], key_end - key_start) == 0) {
 		scan_append_section_heading(scan, index, &file->buffer[val_start]);
 	}
 

zkey/keystore.c

@@ -3235,7 +3235,7 @@ static int _keystore_execute_cmd(const char *cmd,
 {
 	int rc;
 
-	rc = setenv("PATH", "/bin:/usr/bin:/usr/sbin", 1);
+	rc = setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin", 1);
 	if (rc < 0)
 		return rc;
 

zkey/pkey.c

@@ -48,6 +48,7 @@
  * Definitions for the CCA library
  */
 #define CCA_LIBRARY_NAME	"libcsulcca.so"
+#define CCA_WEB_PAGE		"http://www.ibm.com/security/cryptocards"
 
 #define DEFAULT_KEYBITS 256
 
@@ -71,16 +72,20 @@ int load_cca_library(void **lib_csulcca, t_CSNBKTC *dll_CSNBKTC, bool verbose)
 	/* Load the CCA library */
 	*lib_csulcca = dlopen(CCA_LIBRARY_NAME, RTLD_GLOBAL | RTLD_NOW);
 	if (*lib_csulcca == NULL) {
-		warnx("%s\nEnsure that the IBM CCA Host Libraries and "
-		      "Tools are installed properly", dlerror());
+		pr_verbose(verbose, "%s", dlerror());
+		warnx("The command requires the IBM CCA Host Libraries and "
+		      "Tools.\nFor the supported environments and downloads, "
+		      "see:\n%s", CCA_WEB_PAGE);
 		return  -ELIBACC;
 	}
 
 	/* Get the Key Token Change function */
 	*dll_CSNBKTC = (t_CSNBKTC)dlsym(*lib_csulcca, "CSNBKTC");
 	if (*dll_CSNBKTC == NULL) {
-		warnx("%s\nEnsure that the IBM CCA Host Libraries and "
-		      "Tools are installed properly", dlerror());
+		pr_verbose(verbose, "%s", dlerror());
+		warnx("The command requires the IBM CCA Host Libraries and "
+		      "Tools.\nFor the supported environments and downloads, "
+		      "see:\n%s", CCA_WEB_PAGE);
 		dlclose(*lib_csulcca);
 		*lib_csulcca = NULL;
 		return -ELIBACC;
@@ -158,8 +163,8 @@ u8 *read_secure_key(const char *keyfile, size_t *secure_key_size,
 
 	buf = util_malloc(size);
 	count = fread(buf, 1, size, fp);
-	if (count <= 0) {
-		msg = feof(fp) ? "File is too small" : strerror(errno);
+	if (count != size) {
+		msg = ferror(fp) ? strerror(errno) : "File is too small";
 		warnx("File '%s': %s", keyfile, msg);
 		free(buf);
 		buf = NULL;
@@ -206,7 +211,7 @@ int write_secure_key(const char *keyfile, const u8 *secure_key,
 	}
 
 	count = fwrite(secure_key, 1, secure_key_size, fp);
-	if (count <= 0) {
+	if (count != secure_key_size) {
 		warnx("File '%s': %s", keyfile, strerror(errno));
 		fclose(fp);
 		return -EIO;
@@ -296,8 +301,8 @@ static u8 *read_clear_key(const char *keyfile, size_t keybits, bool xts,
 
 	buf = util_malloc(size);
 	count = fread(buf, 1, size, fp);
-	if (count <= 0) {
-		msg = feof(fp) ? "File is too small" : strerror(errno);
+	if (count != size) {
+		msg = ferror(fp) ? strerror(errno) : "File is too small";
 		warnx("File '%s': %s", keyfile, msg);
 		free(buf);
 		buf = NULL;

zkey/zkey-cryptsetup.1

@@ -182,7 +182,8 @@ behave in the same way as with \fBcryptsetup\fP.
 .PP
 .B Note:
 The \fBreencipher\fP command requires the CCA host library (libcsulcca.so)
-to be installed.
+to be installed. For the supported environments and downloads, see:
+\fIhttp://www.ibm.com/security/cryptocards\fP
 .
 .
 .

zkey/zkey.1

@@ -282,7 +282,8 @@ a staged re-enciphering for the \fBOLD\fP to \fBCURRENT\fP case.
 .PP
 .B Note:
 The \fBreencipher\fP command requires the CCA host library (libcsulcca.so)
-to be installed.
+to be installed. For the supported environments and downloads, see:
+\fIhttp://www.ibm.com/security/cryptocards\fP
 .
 .SS "Import existing AES secure keys into the secure key repository"
 .

zpcictl/zpcictl.8

@@ -33,7 +33,7 @@ zpcictl - Manage PCI devices on IBM Z
 Use
 .B zpcictl
 to manage PCI devices on the IBM Z platform. In particular,
-use this command to report defective PCI devices to the service element.
+use this command to report defective PCI devices to the Support Element (SE).
 
 .B Note:
 For NVMe devices additional data (such as S.M.A.R.T. data) is collected and sent

zpcictl/zpcictl.c

@@ -60,7 +60,7 @@ static struct util_opt opt_vec[] = {
 	},
 	{
 		.option = { "report-error", no_argument, NULL, OPT_REPORT_ERR },
-		.desc = "Report a device error to the service element (SE)",
+		.desc = "Report a device error to the Support Element (SE)",
 		.flags = UTIL_OPT_FLAG_NOSHORT,
 	},
 	UTIL_OPT_SECTION("GENERAL OPTIONS"),
@@ -171,8 +171,12 @@ static void sysfs_write_data(struct zpci_report_error *report, char *slot)
 		fopen_err(path);
 	if (fwrite(report, 1, r_size, fp) != r_size)
 		warnx("Could not write to file: %s: %s", path, strerror(errno));
-	if (fclose(fp))
-		warnx("Could not close file: %s: %s", path, strerror(errno));
+	if (fclose(fp)) {
+		if (errno == EIO || errno == EOPNOTSUPP)
+			warnx("Unsupported operation: %s: %s", path, strerror(errno));
+		else
+			warnx("Could not close file: %s: %s", path, strerror(errno));
+	}
 	free(path);
 }
 
@@ -309,7 +313,8 @@ static void sclp_issue_action(struct zpci_device *pdev, int action)
 	if (pdev->class == PCI_CLASS_NVME)
 		sdata = collect_smart_data(pdev);
 	if (sdata) {
-		strncpy(report.data.log_data, sdata, sizeof(report.data.log_data));
+		util_strlcpy(report.data.log_data, sdata,
+			     sizeof(report.data.log_data));
 		free(sdata);
 	}
 	sysfs_write_data(&report, pdev->slot);