i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

null_read() didn't reset the length, and thus could be read forever - this

Browse Source 
fixes bug #631.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17591 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-05-25 20:02:49 +00:00
parent 506c8fbbbf
commit 6023deb2cd
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/common/null.c
+10 -12
View File
@@ -1,12 +1,16 @@
/* /*
** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. * Copyright 2002-2006, Haiku, Inc. All Rights Reserved.
** Distributed under the terms of the NewOS License. * Distributed under the terms of the MIT License.
*/ *
* Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
* Distributed under the terms of the NewOS License.
*/
#include <Drivers.h> #include <Drivers.h>
#include <string.h> #include <string.h>
#define DEVICE_NAME "null" #define DEVICE_NAME "null"
int32 api_version = B_CUR_DRIVER_API_VERSION; int32 api_version = B_CUR_DRIVER_API_VERSION;
@@ -42,14 +46,15 @@ null_ioctl(void *cookie, uint32 op, void *buffer, size_t length)
static status_t static status_t
null_read(void *cookie, off_t pos, void *buffer, size_t *length) null_read(void *cookie, off_t pos, void *buffer, size_t *_length)
{ {
*_length = 0;
return B_OK; return B_OK;
} }
static status_t static status_t
null_write(void * cookie, off_t pos, const void *buf, size_t *len) null_write(void *cookie, off_t pos, const void *buffer, size_t *_length)
{ {
return B_OK; return B_OK;
} }
@@ -87,13 +92,6 @@ find_device(const char *name)
&null_ioctl, &null_ioctl,
&null_read, &null_read,
&null_write, &null_write,
/* Leave select/deselect/readv/writev undefined. The kernel will
* use its own default implementation. The basic hooks above this
* line MUST be defined, however. */
NULL,
NULL,
NULL,
NULL
}; };
if (!strcmp(name, DEVICE_NAME)) if (!strcmp(name, DEVICE_NAME))