Page MenuHomeFreeBSD

D26214.diff
No OneTemporary

D26214.diff

Index: head/sys/dev/fb/fbd.c
===================================================================
--- head/sys/dev/fb/fbd.c
+++ head/sys/dev/fb/fbd.c
@@ -176,7 +176,7 @@
if (info->fb_flags & FB_FLAG_NOMMAP)
return (ENODEV);
- if (offset >= 0 && offset < info->fb_size) {
+ if (offset < info->fb_size) {
if (info->fb_pbase == 0)
*paddr = vtophys((uint8_t *)info->fb_vbase + offset);
else
Index: head/sys/dev/ksyms/ksyms.c
===================================================================
--- head/sys/dev/ksyms/ksyms.c
+++ head/sys/dev/ksyms/ksyms.c
@@ -484,7 +484,7 @@
if (error != 0)
return (error);
- if (*offset < 0 || *offset >= round_page(sc->sc_objsz) ||
+ if (*offset >= round_page(sc->sc_objsz) ||
size > round_page(sc->sc_objsz) - *offset ||
(nprot & ~PROT_READ) != 0)
return (EINVAL);
Index: head/sys/dev/vt/hw/fb/vt_fb.c
===================================================================
--- head/sys/dev/vt/hw/fb/vt_fb.c
+++ head/sys/dev/vt/hw/fb/vt_fb.c
@@ -140,7 +140,7 @@
if (info->fb_flags & FB_FLAG_NOMMAP)
return (ENODEV);
- if (offset >= 0 && offset < info->fb_size) {
+ if (offset < info->fb_size) {
if (info->fb_pbase == 0) {
*paddr = vtophys((uint8_t *)info->fb_vbase + offset);
} else {
Index: head/sys/fs/tmpfs/tmpfs_subr.c
===================================================================
--- head/sys/fs/tmpfs/tmpfs_subr.c
+++ head/sys/fs/tmpfs/tmpfs_subr.c
@@ -178,12 +178,14 @@
size_t
tmpfs_mem_avail(void)
{
- vm_ooffset_t avail;
+ size_t avail;
+ long reserved;
- avail = swap_pager_avail + vm_free_count() - tmpfs_pages_reserved;
- if (__predict_false(avail < 0))
- avail = 0;
- return (avail);
+ avail = swap_pager_avail + vm_free_count();
+ reserved = atomic_load_long(&tmpfs_pages_reserved);
+ if (__predict_false(avail < reserved))
+ return (0);
+ return (avail - reserved);
}
size_t
Index: head/sys/kern/uipc_shm.c
===================================================================
--- head/sys/kern/uipc_shm.c
+++ head/sys/kern/uipc_shm.c
@@ -1577,7 +1577,7 @@
#ifdef _LP64
objsize > OFF_MAX ||
#endif
- foff < 0 || foff > OFF_MAX - objsize) {
+ foff > OFF_MAX - objsize) {
error = EINVAL;
goto out;
}
Index: head/sys/kern/vfs_vnops.c
===================================================================
--- head/sys/kern/vfs_vnops.c
+++ head/sys/kern/vfs_vnops.c
@@ -2630,7 +2630,7 @@
#ifdef _LP64
size > OFF_MAX ||
#endif
- foff < 0 || foff > OFF_MAX - size)
+ foff > OFF_MAX - size)
return (EINVAL);
writecounted = FALSE;
Index: head/sys/vm/vnode_pager.c
===================================================================
--- head/sys/vm/vnode_pager.c
+++ head/sys/vm/vnode_pager.c
@@ -541,9 +541,6 @@
daddr_t vblock;
daddr_t voffset;
- if (address < 0)
- return -1;
-
if (VN_IS_DOOMED(vp))
return -1;

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 4, 2:38 AM (22 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13508652
Default Alt Text
D26214.diff (2 KB)

Event Timeline