trace-cmd: Use lseek64 and off64_t in tracecmd_append_cpu_data().
PATCH 1/1 trace-cmd: Use lseek64 and off64_t in tracecmd_append_cpu_data().
lseek64 returns 64-bit, but was being truncated to int. Large offsets would cause the subsequent error checking to fail spuriously, leaving behind a bad trace.dat and a collection of trace.dat.cpuX files.
--- trace-output.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
trace-output.c +5 -5
@@ -705,9 +705,9 @@ out_free:int tracecmd_append_cpu_data (struct tracecmd_output *handle,int cpus,char *const *cpu_data_files) { -unsigned long long *offsets =NULL ; +off64_t *offsets =NULL ;unsigned long long *sizes =NULL ; -unsigned long long offset; +off64_t offset;unsigned long long endian8;off64_t check_size;char *file;
@@ -733,7 +733,7 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle,if (!sizes) goto out_free; - offset =lseek (handle->fd,0 ,SEEK_CUR ); + offset =lseek64 (handle->fd,0 ,SEEK_CUR );/* hold any extra data for data */ offset += cpus * (16 );
@@ -761,8 +761,8 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle,for (i =0 ; i < cpus; i++) {fprintf (stderr,"offset=%llx\n" , offsets[i]); - ret =lseek64 (handle->fd, offsets[i],SEEK_SET ); -if (ret <0 ) { + offset =lseek64 (handle->fd, offsets[i],SEEK_SET ); +if (offset == (off64_t)-1 ) {warning ("could not seek to %lld\n" , offsets[i]); goto out_free; }
Signature · 1 line
1.7.1
Hi David,
Quoted 3 lines · David Sharp
lseek64 returns 64-bit, but was being truncated to int. Large offsets would cause the subsequent error checking to fail spuriously, leaving behind a bad trace.dat and a collection of trace.dat.cpuX files.
Could you resend with your SoB.
Thanks!
-- Steve
Quoted 40 lines
--- trace-output.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)trace-output.c +5
-5@@ -705,9 +705,9 @@ out_free:int tracecmd_append_cpu_data (struct tracecmd_output *handle,int cpus,char *const *cpu_data_files) { -unsigned long long *offsets =NULL ; +off64_t *offsets =NULL ;unsigned long long *sizes =NULL ; -unsigned long long offset; +off64_t offset;unsigned long long endian8;off64_t check_size;char *file;@@ -733,7 +733,7 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle,if (!sizes) goto out_free; - offset =lseek (handle->fd,0 ,SEEK_CUR ); + offset =lseek64 (handle->fd,0 ,SEEK_CUR );/* hold any extra data for data */ offset += cpus * (16 );@@ -761,8 +761,8 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle,for (i =0 ; i < cpus; i++) {fprintf (stderr,"offset=%llx\n" , offsets[i]); - ret =lseek64 (handle->fd, offsets[i],SEEK_SET ); -if (ret <0 ) { + offset =lseek64 (handle->fd, offsets[i],SEEK_SET ); +if (offset == (off64_t)-1 ) {warning ("could not seek to %lld\n" , offsets[i]); goto out_free; }
PATCH 1/1 trace-cmd: Use lseek64 and off64_t in tracecmd_append_cpu_data().
lseek64 returns 64-bit, but was being truncated to int. Large offsets would cause the subsequent error checking to fail spuriously, leaving behind a bad trace.dat and a collection of trace.dat.cpuX files.
--- trace-output.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
trace-output.c +5 -5
@@ -705,9 +705,9 @@ out_free:int tracecmd_append_cpu_data (struct tracecmd_output *handle,int cpus,char *const *cpu_data_files) { -unsigned long long *offsets =NULL ; +off64_t *offsets =NULL ;unsigned long long *sizes =NULL ; -unsigned long long offset; +off64_t offset;unsigned long long endian8;off64_t check_size;char *file;
@@ -733,7 +733,7 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle,if (!sizes) goto out_free; - offset =lseek (handle->fd,0 ,SEEK_CUR ); + offset =lseek64 (handle->fd,0 ,SEEK_CUR );/* hold any extra data for data */ offset += cpus * (16 );
@@ -761,8 +761,8 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle,for (i =0 ; i < cpus; i++) {fprintf (stderr,"offset=%llx\n" , offsets[i]); - ret =lseek64 (handle->fd, offsets[i],SEEK_SET ); -if (ret <0 ) { + offset =lseek64 (handle->fd, offsets[i],SEEK_SET ); +if (offset == (off64_t)-1 ) {warning ("could not seek to %lld\n" , offsets[i]); goto out_free; }
Signature · 1 line
1.7.1