| Message ID | 20201118104742.62817-1-wanghai38@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] android/ion: fix error return code in opensocket() | expand |
On 11/18/20 3:47 AM, Wang Hai wrote: > Fix to return a negative error code from the error handling > case instead of 0, as done elsewhere in this function. > > Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Wang Hai <wanghai38@huawei.com> > --- > v1->v2: add missing ";" > tools/testing/selftests/android/ion/ipcsocket.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/android/ion/ipcsocket.c b/tools/testing/selftests/android/ion/ipcsocket.c > index 7dc521002095..13b3455ba39c 100644 > --- a/tools/testing/selftests/android/ion/ipcsocket.c > +++ b/tools/testing/selftests/android/ion/ipcsocket.c > @@ -28,8 +28,9 @@ int opensocket(int *sockfd, const char *name, int connecttype) > } > > *sockfd = ret; > - if (setsockopt(*sockfd, SOL_SOCKET, SO_REUSEADDR, > - (char *)&temp, sizeof(int)) < 0) { > + ret = setsockopt(*sockfd, SOL_SOCKET, SO_REUSEADDR, (char *)&temp, > + sizeof(int)); > + if (ret < 0) { > fprintf(stderr, "<%s>: Failed setsockopt: <%s>\n", > __func__, strerror(errno)); > goto err; > This test is slated removal and I have stopped accepting patches that aren't critical fixes at this time. thanks, -- Shuah
diff --git a/tools/testing/selftests/android/ion/ipcsocket.c b/tools/testing/selftests/android/ion/ipcsocket.c index 7dc521002095..13b3455ba39c 100644 --- a/tools/testing/selftests/android/ion/ipcsocket.c +++ b/tools/testing/selftests/android/ion/ipcsocket.c @@ -28,8 +28,9 @@ int opensocket(int *sockfd, const char *name, int connecttype) } *sockfd = ret; - if (setsockopt(*sockfd, SOL_SOCKET, SO_REUSEADDR, - (char *)&temp, sizeof(int)) < 0) { + ret = setsockopt(*sockfd, SOL_SOCKET, SO_REUSEADDR, (char *)&temp, + sizeof(int)); + if (ret < 0) { fprintf(stderr, "<%s>: Failed setsockopt: <%s>\n", __func__, strerror(errno)); goto err;
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wang Hai <wanghai38@huawei.com> --- v1->v2: add missing ";" tools/testing/selftests/android/ion/ipcsocket.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)