upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-18 18:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

vm_object: do not assume that un_pager.devp.dev is cdev

Browse source 
PR:	282533

(cherry picked from commit 580340dbdaaf372867e9ed3dd257430982753e5e)
This commit is contained in:
Konstantin Belousov 2024-11-04 23:54:30 +02:00
parent c57dc755fa
commit 92a9501b6b
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/kern/kern_proc.c
View file

@ -2718,8 +2718,9 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags)
kve->kve_ref_count = obj->ref_count;
kve->kve_shadow_count = obj->shadow_count;
if (obj->type == OBJT_DEVICE ||
obj->type == OBJT_MGTDEVICE) {
if ((obj->type == OBJT_DEVICE ||
obj->type == OBJT_MGTDEVICE) &&
(obj->flags & OBJ_CDEVH) != 0) {
cdev = obj->un_pager.devp.handle;
if (cdev != NULL) {
csw = dev_refthread(cdev, &ref);

3
sys/vm/vm_mmap.c
View file

@ -1435,6 +1435,9 @@ vm_mmap_cdev(struct thread *td, vm_size_t objsize, vm_prot_t prot,
td->td_ucred);
if (obj == NULL)
return (EINVAL);
VM_OBJECT_WLOCK(obj);
vm_object_set_flag(obj, OBJ_CDEVH);
VM_OBJECT_WUNLOCK(obj);
*objp = obj;
*flagsp = flags;
return (0);

3
sys/vm/vm_object.c
View file

@ -2610,7 +2610,8 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only)
sp = swap_pager_swapped_pages(obj);
kvo->kvo_swapped = sp > UINT32_MAX ? UINT32_MAX : sp;
}
if (obj->type == OBJT_DEVICE || obj->type == OBJT_MGTDEVICE) {
if ((obj->type == OBJT_DEVICE || obj->type == OBJT_MGTDEVICE) &&
(obj->flags & OBJ_CDEVH) != 0) {
cdev = obj->un_pager.devp.handle;
if (cdev != NULL) {
csw = dev_refthread(cdev, &ref);

1
sys/vm/vm_object.h
View file

@ -206,6 +206,7 @@ struct vm_object {
#define OBJ_PAGERPRIV2 0x00008000 /* Pager private */
#define OBJ_SYSVSHM 0x00010000 /* SysV SHM */
#define OBJ_POSIXSHM 0x00020000 /* Posix SHM */
#define OBJ_CDEVH 0x00040000 /* OBJT_DEVICE handle is cdev */
/*
* Helpers to perform conversion between vm_object page indexes and offsets.