From fc96b17af8cc4ab91ea50a0d4ebfe66357674e7a Mon Sep 17 00:00:00 2001 From: liujinhui-job Date: Tue, 27 May 2025 15:39:18 +0800 Subject: [PATCH 1/2] ff_config.c parse pci_whitelist to --allow, so config.ini use pci_whitelist --- adapter/syscall/ff_hook_syscall.c | 4 ++-- config.ini | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adapter/syscall/ff_hook_syscall.c b/adapter/syscall/ff_hook_syscall.c index 165471a1d..9b2a9b34b 100644 --- a/adapter/syscall/ff_hook_syscall.c +++ b/adapter/syscall/ff_hook_syscall.c @@ -795,7 +795,7 @@ ff_hook_recv(int fd, void *buf, size_t len, int flags) } ssize_t -ff_hook___recv_chk(int fd, void *buf, size_t buflen, size_t len, int flags) +ff_hook___recv_chk(int fd, void *buf, size_t len, size_t buflen, int flags) { DEBUG_LOG("ff_hook___recv_chk, fd:%d, buf:%p, len:%lu, flags:%d\n", fd, buf, len, flags); @@ -1426,7 +1426,7 @@ ff_hook_read(int fd, void *buf, size_t len) } ssize_t -ff_hook___read_chk(int fd, void *buf, size_t nbytes, size_t len) +ff_hook___read_chk(int fd, void *buf, size_t nbytes, size_t buflen) { DEBUG_LOG("ff_hook___read_chk, fd:%d, buf:%p, len:%lu\n", fd, buf, len); diff --git a/config.ini b/config.ini index 0219ae624..a265a6388 100644 --- a/config.ini +++ b/config.ini @@ -45,9 +45,9 @@ symmetric_rss=0 # PCI device enable list. # And driver options -#allow=02:00.0 +#pci_whitelist=02:00.0 # for multiple PCI devices -#allow=02:00.0,03:00.0 +#pci_whitelist=02:00.0,03:00.0 # enabled port list # From 4da0fc44ca45c56f0940dc958c5e2f1362aa673a Mon Sep 17 00:00:00 2001 From: liujinhui-job Date: Thu, 5 Jun 2025 22:50:40 +0800 Subject: [PATCH 2/2] Update ff_hook_syscall.c --- adapter/syscall/ff_hook_syscall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adapter/syscall/ff_hook_syscall.c b/adapter/syscall/ff_hook_syscall.c index 9b2a9b34b..b4f11e2c0 100644 --- a/adapter/syscall/ff_hook_syscall.c +++ b/adapter/syscall/ff_hook_syscall.c @@ -1426,11 +1426,11 @@ ff_hook_read(int fd, void *buf, size_t len) } ssize_t -ff_hook___read_chk(int fd, void *buf, size_t nbytes, size_t buflen) +ff_hook___read_chk(int fd, void *buf, size_t nbytes, size_t len) { DEBUG_LOG("ff_hook___read_chk, fd:%d, buf:%p, len:%lu\n", fd, buf, len); - if (buflen < nbytes) + if (len < nbytes) __chk_fail(); if (buf == NULL || len == 0) {