Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ken/aug14merge #71

Merged
merged 2 commits into from
Aug 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions testcases/kernel/syscalls/read/read02.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ static struct tcase {
{&badfd, &bufaddr, 1, EBADF},
{&fd2, &bufaddr, 1, EISDIR},
#ifndef UCLINUX
#if 0 // See sgx-lkl issue 772 - we cannot catch protected memory regions in lkl_access_ok
{&fd3, &outside_buf, 1, EFAULT},
#endif
#endif
{&fd4, &addr4, 1, EINVAL},
{&fd4, &addr5, 4096, EINVAL},
Expand Down
2 changes: 2 additions & 0 deletions testcases/kernel/syscalls/recv/recv01.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,12 @@ struct test_case_t { /* test case structure */
,
#ifndef UCLINUX
/* Skip since uClinux does not implement memory protection */
#if 0 // See sgx-lkl issue 772 - we cannot catch protected memory regions in lkl_access_ok
{
PF_INET, SOCK_STREAM, 0, (void *)-1, sizeof(buf), 0,
-1, EFAULT, setup1, cleanup1, "invalid recv buffer"}
,
#endif
#endif
{
PF_INET, SOCK_STREAM, 0, buf, sizeof(buf), MSG_OOB,
Expand Down
2 changes: 2 additions & 0 deletions testcases/kernel/syscalls/setsockopt/setsockopt01.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,14 @@ struct test_case_t { /* test case structure */
"bad file descriptor"}
,
#if !defined(UCLINUX)
#if 0 // See sgx-lkl issue 772 - we cannot catch protected memory regions in lkl_access_ok
{
PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, 0,
sizeof(optval), (struct sockaddr *)&fsin1,
sizeof(fsin1), -1, EFAULT, setup1, cleanup1,
"invalid option buffer"}
,
#endif
#endif
{
PF_INET, SOCK_STREAM, 0, SOL_SOCKET, SO_OOBINLINE, &optval, 0,
Expand Down