From dd9469524f8de0c2ea06b390698a8b104090ade3 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 5 Mar 2006 11:47:36 +0000 Subject: 2006-03-05 Roland McGrath * io-seek.c (diskfs_S_io_seek): Return EINVAL if file pointer would become negative. --- libdiskfs/io-seek.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'libdiskfs') diff --git a/libdiskfs/io-seek.c b/libdiskfs/io-seek.c index 6bdd4195..71179816 100644 --- a/libdiskfs/io-seek.c +++ b/libdiskfs/io-seek.c @@ -1,5 +1,5 @@ -/* - Copyright (C) 1994, 1995, 1996, 2000 Free Software Foundation +/* + Copyright (C) 1994,1995,1996,2000,2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -28,31 +28,33 @@ diskfs_S_io_seek (struct protid *cred, { error_t err = 0; struct node *np; - + if (!cred) return EOPNOTSUPP; - + np = cred->po->np; - + mutex_lock (&np->lock); - + iohelp_get_conch (&np->conch); switch (whence) { - case SEEK_SET: - cred->po->filepointer = offset; - break; case SEEK_CUR: - cred->po->filepointer += offset; - break; + offset += cred->po->filepointer; + goto check; case SEEK_END: - cred->po->filepointer = (np->dn_stat.st_size + offset); - break; + offset += np->dn_stat.st_size; + case SEEK_SET: + check: + if (offset >= 0) + { + *newoffset = cred->po->filepointer = offset; + break; + } default: err = EINVAL; break; } - *newoffset = cred->po->filepointer; mutex_unlock (&np->lock); return err; -- cgit v1.2.3