[libcamera-devel] [PATCH 1/2] libcamera: Don't ignore the return value of read() and write()

[Jacopo Mondi]

HI Laurent,

On Mon, Apr 29, 2019 at 02:12:37AM +0300, Laurent Pinchart wrote:
> The glibc read() and write() functions are defined with the
> __warn_unused_result__ attribute when using FORTIFY_SOURCE. Don't ignore
> their return value.
>

Reviewed-by: Jacopo Mondi <jacopo at jmondi.org>

> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
>  src/libcamera/event_dispatcher_poll.cpp |  8 ++++++--
>  test/event.cpp                          | 13 +++++++++++--
>  2 files changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/src/libcamera/event_dispatcher_poll.cpp b/src/libcamera/event_dispatcher_poll.cpp
> index 1f0f352a8e0a..2621b7d96b1e 100644
> --- a/src/libcamera/event_dispatcher_poll.cpp
> +++ b/src/libcamera/event_dispatcher_poll.cpp
> @@ -162,7 +162,9 @@ void EventDispatcherPoll::processEvents()
>  void EventDispatcherPoll::interrupt()
>  {
>  	uint64_t value = 1;
> -	write(eventfd_, &value, sizeof(value));
> +	ssize_t ret = write(eventfd_, &value, sizeof(value));
> +	if (ret < 0)
> +		LOG(Event, Error) << "Failed to interrupt event dispatcher";
>  }
>
>  short EventDispatcherPoll::EventNotifierSetPoll::events() const
> @@ -214,7 +216,9 @@ void EventDispatcherPoll::processInterrupt(const struct pollfd &pfd)
>  		return;
>
>  	uint64_t value;
> -	read(eventfd_, &value, sizeof(value));
> +	ssize_t ret = read(eventfd_, &value, sizeof(value));
> +	if (ret < 0)
> +		LOG(Event, Error) << "Failed to process interrupt";
>  }
>
>  void EventDispatcherPoll::processNotifiers(const std::vector<struct pollfd> &pollfds)
> diff --git a/test/event.cpp b/test/event.cpp
> index 52bc0c7e77f5..9bd876153a18 100644
> --- a/test/event.cpp
> +++ b/test/event.cpp
> @@ -38,6 +38,7 @@ protected:
>  		EventDispatcher *dispatcher = CameraManager::instance()->eventDispatcher();
>  		std::string data("H2G2");
>  		Timer timeout;
> +		ssize_t ret;
>
>  		EventNotifier readNotifier(pipefd_[0], EventNotifier::Read);
>  		readNotifier.activated.connect(this, &EventTest::readReady);
> @@ -46,7 +47,11 @@ protected:
>  		memset(data_, 0, sizeof(data_));
>  		size_ = 0;
>
> -		write(pipefd_[1], data.data(), data.size());
> +		ret = write(pipefd_[1], data.data(), data.size());
> +		if (ret < 0) {
> +			cout << "Pipe write failed" << endl;
> +			return TestFail;
> +		}
>
>  		timeout.start(100);
>  		dispatcher->processEvents();
> @@ -73,7 +78,11 @@ protected:
>  		notified_ = false;
>  		readNotifier.setEnabled(false);
>
> -		write(pipefd_[1], data.data(), data.size());
> +		ret = write(pipefd_[1], data.data(), data.size());
> +		if (ret < 0) {
> +			cout << "Pipe write failed" << endl;
> +			return TestFail;
> +		}
>
>  		timeout.start(100);
>  		dispatcher->processEvents();
> --
> Regards,
>
> Laurent Pinchart
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.libcamera.org/pipermail/libcamera-devel/attachments/20190429/3d4d55cd/attachment.sig>