From 227f89ffd4da431cd05f9b54ea7882c70b63f3dd Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 21 Feb 2006 15:24:40 +0100 Subject: [PATCH] [PATCH] blktrace: valid magic in received header always --- blktrace.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/blktrace.c b/blktrace.c index a87ef0d..39280ca 100644 --- a/blktrace.c +++ b/blktrace.c @@ -1370,7 +1370,7 @@ static int net_get_header(struct blktrace_net_hdr *bnh) } } fcntl(net_in_fd, F_SETFL, fl & ~O_NONBLOCK); - return 0; + return bytes_left; } static int net_server_loop(struct in_addr *cl_in_addr) @@ -1387,10 +1387,16 @@ static int net_server_loop(struct in_addr *cl_in_addr) } if (!data_is_native) { + bnh.magic = be32_to_cpu(bnh.magic); bnh.cpu = be32_to_cpu(bnh.cpu); bnh.len = be32_to_cpu(bnh.len); } + if ((bnh.magic & 0xffffff00) != BLK_IO_TRACE_MAGIC) { + fprintf(stderr, "server: bad data magic\n"); + return 1; + } + /* * len == 0 means that the other end signalled end-of-run */ -- 2.25.1