X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=007eef8fcc3d773e71bc7a4c9ffac6ecec11e5dc;hb=c3c60f7dadb9996f53935e359e44e1f9b93dffb4;hp=43a5d366348d98a1037ec4a9bef3024b0ba6a5e2;hpb=a621010b2b65472f811bd4fda93c7228324669be;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 43a5d3663..007eef8fc 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -1325,12 +1325,34 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		}
 		ret = update_stream_stats(stream);
 		if (ret < 0) {
+			err = kernctl_put_subbuf(infd);
+			if (err != 0) {
+				if (err == -EFAULT) {
+					PERROR("Error in unreserving sub buffer\n");
+				} else if (err == -EIO) {
+					/* Should never happen with newer LTTng versions */
+					PERROR("Reader has been pushed by the writer, last sub-buffer corrupted.");
+				}
+				ret = err;
+				goto end;
+			}
 			goto end;
 		}
 	} else {
 		write_index = 0;
 		ret = metadata_stream_check_version(infd, stream);
 		if (ret < 0) {
+			err = kernctl_put_subbuf(infd);
+			if (err != 0) {
+				if (err == -EFAULT) {
+					PERROR("Error in unreserving sub buffer\n");
+				} else if (err == -EIO) {
+					/* Should never happen with newer LTTng versions */
+					PERROR("Reader has been pushed by the writer, last sub-buffer corrupted.");
+				}
+				ret = err;
+				goto end;
+			}
 			goto end;
 		}
 	}