Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Insert casts to off_t to avoid 32-bit multiplication overflow when 

computing device offsets on 32-bit platforms. Should fix PR 45191.
This commit is contained in:
dholland 2011-08-03 16:21:52 +00:00
parent 7f03f2cad6
commit 66d63879a2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/fs/v7fs/v7fs_io_user.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: v7fs_io_user.c,v 1.2 2011/07/18 21:51:49 apb Exp $ */ /* $NetBSD: v7fs_io_user.c,v 1.3 2011/08/03 16:21:52 dholland Exp $ */
/*- /*-
* Copyright (c) 2011 The NetBSD Foundation, Inc. * Copyright (c) 2011 The NetBSD Foundation, Inc.
@ -35,7 +35,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: v7fs_io_user.c,v 1.2 2011/07/18 21:51:49 apb Exp $"); __RCSID("$NetBSD: v7fs_io_user.c,v 1.3 2011/08/03 16:21:52 dholland Exp $");
#endif /* not lint */ #endif /* not lint */
#include <stdio.h> #include <stdio.h>
@ -125,7 +125,7 @@ read_sector(void *ctx, uint8_t *buf, daddr_t sector)
size_t blksz = lio->blksz; size_t blksz = lio->blksz;
int fd = lio->fd; int fd = lio->fd;
if ((lseek(fd, sector * blksz, SEEK_SET) < 0) || if ((lseek(fd, (off_t)sector * blksz, SEEK_SET) < 0) ||
(read(fd, buf, blksz) < (ssize_t)blksz)) { (read(fd, buf, blksz) < (ssize_t)blksz)) {
warn("sector=%ld\n", (long)sector); warn("sector=%ld\n", (long)sector);
return false; return false;
@ -141,7 +141,7 @@ write_sector(void *ctx, uint8_t *buf, daddr_t sector)
size_t blksz = lio->blksz; size_t blksz = lio->blksz;
int fd = lio->fd; int fd = lio->fd;
if ((lseek(fd, sector * blksz, SEEK_SET) < 0) || if ((lseek(fd, (off_t)sector * blksz, SEEK_SET) < 0) ||
(write(fd, buf, blksz) < (ssize_t)blksz)) { (write(fd, buf, blksz) < (ssize_t)blksz)) {
warn("sector=%ld\n", (long)sector); warn("sector=%ld\n", (long)sector);
return false; return false;