Skip to content

Commit

Permalink
fix: use Long_val for sendfile() parameters to fix file copying in …
Browse files Browse the repository at this point in the history
…docker (ocaml#10333)

* fix: sendfile() in docker

Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com>

* use ssize_t for return value

Co-authored-by: Etienne Millon <etienne.millon@gmail.com>
Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com>

* update test

Signed-off-by: Etienne Millon <me@emillon.org>

* Add changelog

Signed-off-by: Etienne Millon <me@emillon.org>

---------

Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com>
Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com>
Signed-off-by: Etienne Millon <me@emillon.org>
Co-authored-by: Etienne Millon <etienne.millon@gmail.com>
Co-authored-by: Etienne Millon <me@emillon.org>
  • Loading branch information
3 people committed Apr 17, 2024
1 parent 50d99a6 commit be6a10e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions 10333.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- fix overflow in sendfile stubs (copy of large files could fail or end with
truncated files) (#10333, @tonyfettes)
6 changes: 3 additions & 3 deletions otherlibs/stdune/src/copyfile_stubs.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ CAMLprim value stdune_copyfile(value v_from, value v_to) {
caml_failwith("copyfile: only on macos");
}

static int dune_sendfile(int in, int out, int length) {
int ret;
static int dune_sendfile(int in, int out, size_t length) {
ssize_t ret;
while (length > 0) {
ret = sendfile(out, in, NULL, length);
if (ret < 0) {
Expand All @@ -90,7 +90,7 @@ CAMLprim value stdune_sendfile(value v_in, value v_out, value v_size) {
caml_release_runtime_system();
/* TODO Use copy_file_range once we have a good mechanism to test for its
* existence */
int ret = dune_sendfile(FD_val(v_in), FD_val(v_out), Int_val(v_size));
int ret = dune_sendfile(FD_val(v_in), FD_val(v_out), Long_val(v_size));
caml_acquire_runtime_system();
if (ret < 0) {
uerror("sendfile", Nothing);
Expand Down
2 changes: 1 addition & 1 deletion test/blackbox-tests/test-cases/sendfile-large-file.t
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ We create a large file and check that it is copied completely.
4294967299

$ dune_cmd stat size _build/default/file.dat
3
4294967299

(3 indicates that the file size is taken modulo 2**32)

0 comments on commit be6a10e

Please sign in to comment.