From df69c215c7c66baf660f3f65414fd34796c96152 Mon Sep 17 00:00:00 2001 From: deraadt Date: Fri, 28 Jun 2019 13:32:41 +0000 Subject: When system calls indicate an error they return -1, not some arbitrary value < 0. errno is only updated in this case. Change all (most?) callers of syscalls to follow this better, and let's see if this strictness helps us in the future. --- usr.sbin/vmd/vmm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr.sbin/vmd/vmm.c') diff --git a/usr.sbin/vmd/vmm.c b/usr.sbin/vmd/vmm.c index 1cb70b6989a..ab01e2589ce 100644 --- a/usr.sbin/vmd/vmm.c +++ b/usr.sbin/vmd/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.92 2019/05/11 19:55:14 jasper Exp $ */ +/* $OpenBSD: vmm.c,v 1.93 2019/06/28 13:32:51 deraadt Exp $ */ /* * Copyright (c) 2015 Mike Larkin @@ -769,7 +769,7 @@ get_info_vm(struct privsep *ps, struct imsg *imsg, int terminate) memset(&vir, 0, sizeof(vir)); /* First ioctl to see how many bytes needed (vip.vip_size) */ - if (ioctl(env->vmd_fd, VMM_IOC_INFO, &vip) < 0) + if (ioctl(env->vmd_fd, VMM_IOC_INFO, &vip) == -1) return (errno); if (vip.vip_info_ct != 0) @@ -781,7 +781,7 @@ get_info_vm(struct privsep *ps, struct imsg *imsg, int terminate) /* Second ioctl to get the actual list */ vip.vip_info = info; - if (ioctl(env->vmd_fd, VMM_IOC_INFO, &vip) < 0) { + if (ioctl(env->vmd_fd, VMM_IOC_INFO, &vip) == -1) { ret = errno; free(info); return (ret); -- cgit v1.2.3-59-g8ed1b