1 files changed, 8 insertions, 2 deletions

diff --git a/lib/libsdp/search.c b/lib/libsdp/search.c
index 98e3e1857aeb..42f162daf831 100644
--- a/lib/libsdp/search.c
+++ b/lib/libsdp/search.c
@@ -133,7 +133,10 @@ sdp_search(void *xss,
 		iov[1].iov_base = (void *) ss->req;
 		iov[1].iov_len = req_cs - ss->req;
 
-		len = writev(ss->s, iov, sizeof(iov)/sizeof(iov[0]));
+		do {
+			len = writev(ss->s, iov, sizeof(iov)/sizeof(iov[0]));
+		} while (len < 0 && errno == EINTR);
+
 		if (len < 0) {
 			ss->error = errno;
 			return (-1);
@@ -145,7 +148,10 @@ sdp_search(void *xss,
 		iov[1].iov_base = (void *) rsp;
 		iov[1].iov_len = ss->imtu;
 
-		len = readv(ss->s, iov, sizeof(iov)/sizeof(iov[0]));
+		do {
+			len = readv(ss->s, iov, sizeof(iov)/sizeof(iov[0]));
+		} while (len < 0 && errno == EINTR);
+
 		if (len < 0) {
 			ss->error = errno;
 			return (-1);