Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-01 20:29:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fb: fix no mmap with get_pinfo, kernel build with data abort

Browse source 
When BUILD_KERNEL, will case userspace access the kernel address and
abort.

Signed-off-by: buxiasen <buxiasen@xiaomi.com>
This commit is contained in:
buxiasen 2025-02-16 00:19:45 +08:00 • committed by Xiang Xiao
parent 4ac0b10318
commit df9fe43cc9
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
examples/fb/fb_main.c
View file

@ -198,6 +198,7 @@ static int fb_init_mem2(FAR struct fb_state_s *state)
int ret;
uintptr_t buf_offset;
struct fb_planeinfo_s pinfo;
FAR void *fbmem;
memset(&pinfo, 0, sizeof(pinfo));
pinfo.display = state->pinfo.display + 1;
@ -207,6 +208,17 @@ static int fb_init_mem2(FAR struct fb_state_s *state)
return EXIT_FAILURE;
}
fbmem = mmap(NULL, pinfo.fblen, PROT_READ | PROT_WRITE,
MAP_SHARED | MAP_FILE, state->fd, 0);
if (fbmem == MAP_FAILED)
{
int errcode = errno;
fprintf(stderr, "ERROR: ioctl(FBIOGET_PLANEINFO) failed: %d\n",
errcode);
return EXIT_FAILURE;
}
/* Check bpp */
if (pinfo.bpp != state->pinfo.bpp)
@ -219,7 +231,7 @@ static int fb_init_mem2(FAR struct fb_state_s *state)
* It needs to be divisible by pinfo.stride
*/
buf_offset = pinfo.fbmem - state->fbmem;
buf_offset = fbmem - state->fbmem;
if ((buf_offset % state->pinfo.stride) != 0)
{
@ -236,7 +248,7 @@ static int fb_init_mem2(FAR struct fb_state_s *state)
/* Use consecutive fbmem2. */
state->mem2_yoffset = state->vinfo.yres;
state->fbmem2 = pinfo.fbmem + state->mem2_yoffset * pinfo.stride;
state->fbmem2 = fbmem + state->mem2_yoffset * pinfo.stride;
printf("Use consecutive fbmem2 = %p, yoffset = %" PRIu32"\n",
state->fbmem2, state->mem2_yoffset);
}
@ -245,7 +257,7 @@ static int fb_init_mem2(FAR struct fb_state_s *state)
/* Use non-consecutive fbmem2. */
state->mem2_yoffset = buf_offset / state->pinfo.stride;
state->fbmem2 = pinfo.fbmem;
state->fbmem2 = fbmem;
printf("Use non-consecutive fbmem2 = %p, yoffset = %" PRIu32"\n",
state->fbmem2, state->mem2_yoffset);
}