pdxx
/
libserverframe
mirror of https://github.com/happyfish100/libserverframe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iova_slice error detect

posix_api
YuQing 2022-02-04 10:59:00 +08:00
parent a46945b6cd
commit 23ff87dea0
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/sf_iov.c
View File

@ -52,6 +52,7 @@ int sf_iova_consume(SFDynamicIOVArray *iova, const int consume_len)
iova->iov = iob; iova->iov = iob;
if (iova->cnt == 0) { if (iova->cnt == 0) {
struct iovec *last; struct iovec *last;
last = iob - 1; last = iob - 1;
last->iov_base = (char *)last->iov_base + last->iov_len; last->iov_base = (char *)last->iov_base + last->iov_len;
last->iov_len = 0; last->iov_len = 0;
@ -68,7 +69,7 @@ int sf_iova_consume(SFDynamicIOVArray *iova, const int consume_len)
return 0; return 0;
} }
static inline void iova_slice(SFDynamicIOVArray *iova, const int slice_len) static inline int iova_slice(SFDynamicIOVArray *iova, const int slice_len)
{ {
struct iovec *iob; struct iovec *iob;
struct iovec *end; struct iovec *end;
@ -88,7 +89,16 @@ static inline void iova_slice(SFDynamicIOVArray *iova, const int slice_len)
} }
} }
iova->cnt = (iob - iova->iov) + 1; if (iob < end) {
iova->cnt = (iob - iova->iov) + 1;
return 0;
} else {
logError("file: "__FILE__", line: %d, "
"iov remain bytes: %d < slice length: %d",
__LINE__, bytes, slice_len);
iova->cnt = 0;
return EOVERFLOW;
}
} }
int sf_iova_first_slice(SFDynamicIOVArray *iova, const int slice_len) int sf_iova_first_slice(SFDynamicIOVArray *iova, const int slice_len)
@ -99,15 +109,14 @@ int sf_iova_first_slice(SFDynamicIOVArray *iova, const int slice_len)
return result; return result;
} }
iova_slice(iova, slice_len); return iova_slice(iova, slice_len);
return 0;
} }
int sf_iova_next_slice(SFDynamicIOVArray *iova, int sf_iova_next_slice(SFDynamicIOVArray *iova,
const int consume_len, const int slice_len) const int consume_len, const int slice_len)
{ {
struct iovec *last; struct iovec *last;
struct iovec *origin; const struct iovec *origin;
int remain_len; int remain_len;
int result; int result;
@ -126,6 +135,5 @@ int sf_iova_next_slice(SFDynamicIOVArray *iova,
} }
} }
iova_slice(iova, slice_len); return iova_slice(iova, slice_len);
return 0;
} }

6
src/sf_iov.h
View File

@ -26,7 +26,7 @@ typedef struct sf_dynamic_iov_array {
struct iovec *ptr; struct iovec *ptr;
struct { struct {
struct iovec *iov; const struct iovec *iov;
int cnt; int cnt;
} input; } input;
@ -39,7 +39,7 @@ typedef struct sf_dynamic_iov_array {
(iova).cnt = (iova).input.cnt = _cnt (iova).cnt = (iova).input.cnt = _cnt
#define sf_iova_destroy(iova) \ #define sf_iova_destroy(iova) \
if ((iova).iov != (iova).input.iov && \ if ((iova).iov != (struct iovec *)(iova).input.iov && \
(iova).ptr != (iova).holder) \ (iova).ptr != (iova).holder) \
free((iova).ptr) free((iova).ptr)
@ -49,7 +49,7 @@ extern "C" {
static inline int sf_iova_check_alloc(SFDynamicIOVArray *iova) static inline int sf_iova_check_alloc(SFDynamicIOVArray *iova)
{ {
if (iova->iov == iova->input.iov) { if (iova->iov == (struct iovec *)iova->input.iov) {
if (iova->input.cnt <= SF_IOV_FIXED_SIZE) { if (iova->input.cnt <= SF_IOV_FIXED_SIZE) {
iova->ptr = iova->holder; iova->ptr = iova->holder;
} else { } else {