* [PATCH] selftests/android/ion: fix heap_type may be uninitialized
@ 2018-03-08 13:48 ` anders.roxell
0 siblings, 0 replies; 15+ messages in thread
From: Anders Roxell @ 2018-03-08 13:48 UTC (permalink / raw)
To: shuah; +Cc: pintu.ping, linux-kselftest, linux-kernel, Anders Roxell
gcc warns that 'heap_type' is not initialized if we don't come through
any of the two 'case' statesments before:
ionapp_export.c:91:2: warning: ‘heap_type’ may be used uninitialized in
this function [-Wmaybe-uninitialized]
printf("heap_type: %ld, heap_size: %ld\n", heap_type, heap_size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In the current code, we initialize the heap_type to -1 before the 'case'
statements. We also change the print_usage function to state that
heap_type and heap_size isn't optional, they are mandatory.
Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing")
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
.../testing/selftests/android/ion/ionapp_export.c | 23 +++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/android/ion/ionapp_export.c b/tools/testing/selftests/android/ion/ionapp_export.c
index a944e72621a9..b42f803e9d2a 100644
--- a/tools/testing/selftests/android/ion/ionapp_export.c
+++ b/tools/testing/selftests/android/ion/ionapp_export.c
@@ -31,16 +31,24 @@
void print_usage(int argc, char *argv[])
{
- printf("Usage: %s [-h <help>] [-i <heap id>] [-s <size in bytes>]\n",
+ printf("Usage: %s [-h <help>] -i <heap id> -s <size in bytes>\n",
argv[0]);
}
+void heap_type_error_text(void)
+{
+ printf("heap_type must be specified\n");
+ printf(" need to specify -i <heap_type>\n");
+ printf(" supported heap types 0 or 1\n");
+}
+
int main(int argc, char *argv[])
{
int opt, ret, status, heapid;
int sockfd, client_fd, shared_fd;
unsigned char *map_buf;
- unsigned long map_len, heap_type, heap_size, flags;
+ unsigned long map_len, heap_size, flags;
+ long heap_type;
struct ion_buffer_info info;
struct socket_info skinfo;
@@ -50,6 +58,7 @@ int main(int argc, char *argv[])
}
heap_size = 0;
+ heap_type = -1;
flags = 0;
while ((opt = getopt(argc, argv, "hi:s:")) != -1) {
@@ -68,7 +77,8 @@ int main(int argc, char *argv[])
heap_type = ION_HEAP_TYPE_SYSTEM_CONTIG;
break;
default:
- printf("ERROR: heap type not supported\n");
+ heap_type_error_text();
+ print_usage(argc, argv);
exit(1);
}
break;
@@ -82,8 +92,15 @@ int main(int argc, char *argv[])
}
}
+ if (heap_type < 0) {
+ heap_type_error_text();
+ print_usage(argc, argv);
+ exit(1);
+ }
+
if (heap_size <= 0) {
printf("heap_size cannot be 0\n");
+ printf(" need to specify -s <heap_size>\n");
print_usage(argc, argv);
exit(1);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH] selftests/android/ion: fix heap_type may be uninitialized
@ 2018-03-08 13:48 ` anders.roxell
0 siblings, 0 replies; 15+ messages in thread
From: anders.roxell @ 2018-03-08 13:48 UTC (permalink / raw)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2776 bytes --]
gcc warns that 'heap_type' is not initialized if we don't come through
any of the two 'case' statesments before:
ionapp_export.c:91:2: warning: ‘heap_type’ may be used uninitialized in
this function [-Wmaybe-uninitialized]
printf("heap_type: %ld, heap_size: %ld\n", heap_type, heap_size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In the current code, we initialize the heap_type to -1 before the 'case'
statements. We also change the print_usage function to state that
heap_type and heap_size isn't optional, they are mandatory.
Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing")
Signed-off-by: Anders Roxell <anders.roxell at linaro.org>
---
.../testing/selftests/android/ion/ionapp_export.c | 23 +++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/android/ion/ionapp_export.c b/tools/testing/selftests/android/ion/ionapp_export.c
index a944e72621a9..b42f803e9d2a 100644
--- a/tools/testing/selftests/android/ion/ionapp_export.c
+++ b/tools/testing/selftests/android/ion/ionapp_export.c
@@ -31,16 +31,24 @@
void print_usage(int argc, char *argv[])
{
- printf("Usage: %s [-h <help>] [-i <heap id>] [-s <size in bytes>]\n",
+ printf("Usage: %s [-h <help>] -i <heap id> -s <size in bytes>\n",
argv[0]);
}
+void heap_type_error_text(void)
+{
+ printf("heap_type must be specified\n");
+ printf(" need to specify -i <heap_type>\n");
+ printf(" supported heap types 0 or 1\n");
+}
+
int main(int argc, char *argv[])
{
int opt, ret, status, heapid;
int sockfd, client_fd, shared_fd;
unsigned char *map_buf;
- unsigned long map_len, heap_type, heap_size, flags;
+ unsigned long map_len, heap_size, flags;
+ long heap_type;
struct ion_buffer_info info;
struct socket_info skinfo;
@@ -50,6 +58,7 @@ int main(int argc, char *argv[])
}
heap_size = 0;
+ heap_type = -1;
flags = 0;
while ((opt = getopt(argc, argv, "hi:s:")) != -1) {
@@ -68,7 +77,8 @@ int main(int argc, char *argv[])
heap_type = ION_HEAP_TYPE_SYSTEM_CONTIG;
break;
default:
- printf("ERROR: heap type not supported\n");
+ heap_type_error_text();
+ print_usage(argc, argv);
exit(1);
}
break;
@@ -82,8 +92,15 @@ int main(int argc, char *argv[])
}
}
+ if (heap_type < 0) {
+ heap_type_error_text();
+ print_usage(argc, argv);
+ exit(1);
+ }
+
if (heap_size <= 0) {
printf("heap_size cannot be 0\n");
+ printf(" need to specify -s <heap_size>\n");
print_usage(argc, argv);
exit(1);
}
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH] selftests/android/ion: fix heap_type may be uninitialized
@ 2018-03-08 13:48 ` anders.roxell
0 siblings, 0 replies; 15+ messages in thread
From: Anders Roxell @ 2018-03-08 13:48 UTC (permalink / raw)
gcc warns that 'heap_type' is not initialized if we don't come through
any of the two 'case' statesments before:
ionapp_export.c:91:2: warning: ‘heap_type’ may be used uninitialized in
this function [-Wmaybe-uninitialized]
printf("heap_type: %ld, heap_size: %ld\n", heap_type, heap_size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In the current code, we initialize the heap_type to -1 before the 'case'
statements. We also change the print_usage function to state that
heap_type and heap_size isn't optional, they are mandatory.
Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing")
Signed-off-by: Anders Roxell <anders.roxell at linaro.org>
---
.../testing/selftests/android/ion/ionapp_export.c | 23 +++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/android/ion/ionapp_export.c b/tools/testing/selftests/android/ion/ionapp_export.c
index a944e72621a9..b42f803e9d2a 100644
--- a/tools/testing/selftests/android/ion/ionapp_export.c
+++ b/tools/testing/selftests/android/ion/ionapp_export.c
@@ -31,16 +31,24 @@
void print_usage(int argc, char *argv[])
{
- printf("Usage: %s [-h <help>] [-i <heap id>] [-s <size in bytes>]\n",
+ printf("Usage: %s [-h <help>] -i <heap id> -s <size in bytes>\n",
argv[0]);
}
+void heap_type_error_text(void)
+{
+ printf("heap_type must be specified\n");
+ printf(" need to specify -i <heap_type>\n");
+ printf(" supported heap types 0 or 1\n");
+}
+
int main(int argc, char *argv[])
{
int opt, ret, status, heapid;
int sockfd, client_fd, shared_fd;
unsigned char *map_buf;
- unsigned long map_len, heap_type, heap_size, flags;
+ unsigned long map_len, heap_size, flags;
+ long heap_type;
struct ion_buffer_info info;
struct socket_info skinfo;
@@ -50,6 +58,7 @@ int main(int argc, char *argv[])
}
heap_size = 0;
+ heap_type = -1;
flags = 0;
while ((opt = getopt(argc, argv, "hi:s:")) != -1) {
@@ -68,7 +77,8 @@ int main(int argc, char *argv[])
heap_type = ION_HEAP_TYPE_SYSTEM_CONTIG;
break;
default:
- printf("ERROR: heap type not supported\n");
+ heap_type_error_text();
+ print_usage(argc, argv);
exit(1);
}
break;
@@ -82,8 +92,15 @@ int main(int argc, char *argv[])
}
}
+ if (heap_type < 0) {
+ heap_type_error_text();
+ print_usage(argc, argv);
+ exit(1);
+ }
+
if (heap_size <= 0) {
printf("heap_size cannot be 0\n");
+ printf(" need to specify -s <heap_size>\n");
print_usage(argc, argv);
exit(1);
}
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH] selftests/android/ion: fix heap_type may be uninitialized
2018-03-08 13:48 ` anders.roxell
(?)
@ 2018-03-16 10:14 ` pintu.ping
-1 siblings, 0 replies; 15+ messages in thread
From: Pintu Kumar @ 2018-03-16 10:14 UTC (permalink / raw)
To: Anders Roxell; +Cc: Shuah Khan, linux-kselftest, open list
On Thu, Mar 8, 2018 at 7:18 PM, Anders Roxell <anders.roxell@linaro.org> wrote:
> gcc warns that 'heap_type' is not initialized if we don't come through
> any of the two 'case' statesments before:
>
OK thanks for your patch.
> ionapp_export.c:91:2: warning: ‘heap_type’ may be used uninitialized in
> this function [-Wmaybe-uninitialized]
> printf("heap_type: %ld, heap_size: %ld\n", heap_type, heap_size);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> In the current code, we initialize the heap_type to -1 before the 'case'
> statements. We also change the print_usage function to state that
> heap_type and heap_size isn't optional, they are mandatory.
>
OK
> Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing")
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
> ---
> .../testing/selftests/android/ion/ionapp_export.c | 23 +++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/android/ion/ionapp_export.c b/tools/testing/selftests/android/ion/ionapp_export.c
> index a944e72621a9..b42f803e9d2a 100644
> --- a/tools/testing/selftests/android/ion/ionapp_export.c
> +++ b/tools/testing/selftests/android/ion/ionapp_export.c
> @@ -31,16 +31,24 @@
>
> void print_usage(int argc, char *argv[])
> {
> - printf("Usage: %s [-h <help>] [-i <heap id>] [-s <size in bytes>]\n",
> + printf("Usage: %s [-h <help>] -i <heap id> -s <size in bytes>\n",
> argv[0]);
> }
>
> +void heap_type_error_text(void)
> +{
> + printf("heap_type must be specified\n");
> + printf(" need to specify -i <heap_type>\n");
> + printf(" supported heap types 0 or 1\n");
> +}
> +
I think this error function needs to be generic.
See explanation below.
> int main(int argc, char *argv[])
> {
> int opt, ret, status, heapid;
> int sockfd, client_fd, shared_fd;
> unsigned char *map_buf;
> - unsigned long map_len, heap_type, heap_size, flags;
> + unsigned long map_len, heap_size, flags;
> + long heap_type;
> struct ion_buffer_info info;
> struct socket_info skinfo;
>
> @@ -50,6 +58,7 @@ int main(int argc, char *argv[])
> }
>
> heap_size = 0;
> + heap_type = -1;
> flags = 0;
>
> while ((opt = getopt(argc, argv, "hi:s:")) != -1) {
> @@ -68,7 +77,8 @@ int main(int argc, char *argv[])
> heap_type = ION_HEAP_TYPE_SYSTEM_CONTIG;
> break;
> default:
> - printf("ERROR: heap type not supported\n");
> + heap_type_error_text();
> + print_usage(argc, argv);
> exit(1);
> }
> break;
> @@ -82,8 +92,15 @@ int main(int argc, char *argv[])
> }
> }
>
> + if (heap_type < 0) {
> + heap_type_error_text();
> + print_usage(argc, argv);
> + exit(1);
> + }
> +
> if (heap_size <= 0) {
> printf("heap_size cannot be 0\n");
> + printf(" need to specify -s <heap_size>\n");
> print_usage(argc, argv);
> exit(1);
> }
I think both heap_type and heap_size error message is almost same.
How about creating a common error handler for both ?
Also it may be possible to merge both the above.
Or, another option is to make use of print_usage function itself,
instead of one more function.
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH] selftests/android/ion: fix heap_type may be uninitialized
@ 2018-03-16 10:14 ` pintu.ping
0 siblings, 0 replies; 15+ messages in thread
From: pintu.ping @ 2018-03-16 10:14 UTC (permalink / raw)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 3866 bytes --]
On Thu, Mar 8, 2018 at 7:18 PM, Anders Roxell <anders.roxell at linaro.org> wrote:
> gcc warns that 'heap_type' is not initialized if we don't come through
> any of the two 'case' statesments before:
>
OK thanks for your patch.
> ionapp_export.c:91:2: warning: ‘heap_type’ may be used uninitialized in
> this function [-Wmaybe-uninitialized]
> printf("heap_type: %ld, heap_size: %ld\n", heap_type, heap_size);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> In the current code, we initialize the heap_type to -1 before the 'case'
> statements. We also change the print_usage function to state that
> heap_type and heap_size isn't optional, they are mandatory.
>
OK
> Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing")
> Signed-off-by: Anders Roxell <anders.roxell at linaro.org>
> ---
> .../testing/selftests/android/ion/ionapp_export.c | 23 +++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/android/ion/ionapp_export.c b/tools/testing/selftests/android/ion/ionapp_export.c
> index a944e72621a9..b42f803e9d2a 100644
> --- a/tools/testing/selftests/android/ion/ionapp_export.c
> +++ b/tools/testing/selftests/android/ion/ionapp_export.c
> @@ -31,16 +31,24 @@
>
> void print_usage(int argc, char *argv[])
> {
> - printf("Usage: %s [-h <help>] [-i <heap id>] [-s <size in bytes>]\n",
> + printf("Usage: %s [-h <help>] -i <heap id> -s <size in bytes>\n",
> argv[0]);
> }
>
> +void heap_type_error_text(void)
> +{
> + printf("heap_type must be specified\n");
> + printf(" need to specify -i <heap_type>\n");
> + printf(" supported heap types 0 or 1\n");
> +}
> +
I think this error function needs to be generic.
See explanation below.
> int main(int argc, char *argv[])
> {
> int opt, ret, status, heapid;
> int sockfd, client_fd, shared_fd;
> unsigned char *map_buf;
> - unsigned long map_len, heap_type, heap_size, flags;
> + unsigned long map_len, heap_size, flags;
> + long heap_type;
> struct ion_buffer_info info;
> struct socket_info skinfo;
>
> @@ -50,6 +58,7 @@ int main(int argc, char *argv[])
> }
>
> heap_size = 0;
> + heap_type = -1;
> flags = 0;
>
> while ((opt = getopt(argc, argv, "hi:s:")) != -1) {
> @@ -68,7 +77,8 @@ int main(int argc, char *argv[])
> heap_type = ION_HEAP_TYPE_SYSTEM_CONTIG;
> break;
> default:
> - printf("ERROR: heap type not supported\n");
> + heap_type_error_text();
> + print_usage(argc, argv);
> exit(1);
> }
> break;
> @@ -82,8 +92,15 @@ int main(int argc, char *argv[])
> }
> }
>
> + if (heap_type < 0) {
> + heap_type_error_text();
> + print_usage(argc, argv);
> + exit(1);
> + }
> +
> if (heap_size <= 0) {
> printf("heap_size cannot be 0\n");
> + printf(" need to specify -s <heap_size>\n");
> print_usage(argc, argv);
> exit(1);
> }
I think both heap_type and heap_size error message is almost same.
How about creating a common error handler for both ?
Also it may be possible to merge both the above.
Or, another option is to make use of print_usage function itself,
instead of one more function.
> --
> 2.11.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH] selftests/android/ion: fix heap_type may be uninitialized
@ 2018-03-16 10:14 ` pintu.ping
0 siblings, 0 replies; 15+ messages in thread
From: Pintu Kumar @ 2018-03-16 10:14 UTC (permalink / raw)
On Thu, Mar 8, 2018@7:18 PM, Anders Roxell <anders.roxell@linaro.org> wrote:
> gcc warns that 'heap_type' is not initialized if we don't come through
> any of the two 'case' statesments before:
>
OK thanks for your patch.
> ionapp_export.c:91:2: warning: ‘heap_type’ may be used uninitialized in
> this function [-Wmaybe-uninitialized]
> printf("heap_type: %ld, heap_size: %ld\n", heap_type, heap_size);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> In the current code, we initialize the heap_type to -1 before the 'case'
> statements. We also change the print_usage function to state that
> heap_type and heap_size isn't optional, they are mandatory.
>
OK
> Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing")
> Signed-off-by: Anders Roxell <anders.roxell at linaro.org>
> ---
> .../testing/selftests/android/ion/ionapp_export.c | 23 +++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/android/ion/ionapp_export.c b/tools/testing/selftests/android/ion/ionapp_export.c
> index a944e72621a9..b42f803e9d2a 100644
> --- a/tools/testing/selftests/android/ion/ionapp_export.c
> +++ b/tools/testing/selftests/android/ion/ionapp_export.c
> @@ -31,16 +31,24 @@
>
> void print_usage(int argc, char *argv[])
> {
> - printf("Usage: %s [-h <help>] [-i <heap id>] [-s <size in bytes>]\n",
> + printf("Usage: %s [-h <help>] -i <heap id> -s <size in bytes>\n",
> argv[0]);
> }
>
> +void heap_type_error_text(void)
> +{
> + printf("heap_type must be specified\n");
> + printf(" need to specify -i <heap_type>\n");
> + printf(" supported heap types 0 or 1\n");
> +}
> +
I think this error function needs to be generic.
See explanation below.
> int main(int argc, char *argv[])
> {
> int opt, ret, status, heapid;
> int sockfd, client_fd, shared_fd;
> unsigned char *map_buf;
> - unsigned long map_len, heap_type, heap_size, flags;
> + unsigned long map_len, heap_size, flags;
> + long heap_type;
> struct ion_buffer_info info;
> struct socket_info skinfo;
>
> @@ -50,6 +58,7 @@ int main(int argc, char *argv[])
> }
>
> heap_size = 0;
> + heap_type = -1;
> flags = 0;
>
> while ((opt = getopt(argc, argv, "hi:s:")) != -1) {
> @@ -68,7 +77,8 @@ int main(int argc, char *argv[])
> heap_type = ION_HEAP_TYPE_SYSTEM_CONTIG;
> break;
> default:
> - printf("ERROR: heap type not supported\n");
> + heap_type_error_text();
> + print_usage(argc, argv);
> exit(1);
> }
> break;
> @@ -82,8 +92,15 @@ int main(int argc, char *argv[])
> }
> }
>
> + if (heap_type < 0) {
> + heap_type_error_text();
> + print_usage(argc, argv);
> + exit(1);
> + }
> +
> if (heap_size <= 0) {
> printf("heap_size cannot be 0\n");
> + printf(" need to specify -s <heap_size>\n");
> print_usage(argc, argv);
> exit(1);
> }
I think both heap_type and heap_size error message is almost same.
How about creating a common error handler for both ?
Also it may be possible to merge both the above.
Or, another option is to make use of print_usage function itself,
instead of one more function.
> --
> 2.11.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2] selftests/android/ion: fix heap_type may be uninitialized
2018-03-08 13:48 ` anders.roxell
(?)
@ 2018-04-05 7:39 ` anders.roxell
-1 siblings, 0 replies; 15+ messages in thread
From: Anders Roxell @ 2018-04-05 7:39 UTC (permalink / raw)
To: shuah, pintu.ping; +Cc: linux-kselftest, linux-kernel, Anders Roxell
gcc warns that 'heap_type' is not initialized if we don't come through
any of the two 'case' statesments before:
ionapp_export.c:91:2: warning: ‘heap_type’ may be used uninitialized in
this function [-Wmaybe-uninitialized]
printf("heap_type: %ld, heap_size: %ld\n", heap_type, heap_size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In the current code, we initialize the heap_type to -1 before the 'case'
statements. We also change the print_usage function to state that
heap_type and heap_size isn't optional, they are mandatory.
Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing")
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
tools/testing/selftests/android/ion/ionapp_export.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/android/ion/ionapp_export.c b/tools/testing/selftests/android/ion/ionapp_export.c
index a944e72621a9..67a0263a7f28 100644
--- a/tools/testing/selftests/android/ion/ionapp_export.c
+++ b/tools/testing/selftests/android/ion/ionapp_export.c
@@ -31,8 +31,10 @@
void print_usage(int argc, char *argv[])
{
- printf("Usage: %s [-h <help>] [-i <heap id>] [-s <size in bytes>]\n",
+ printf("Usage: %s [-h <help>] -i <heap id> -s <size in bytes>\n",
argv[0]);
+ printf(" Supported heap id's 0 or 1\n");
+ printf(" Heap size > 0\n");
}
int main(int argc, char *argv[])
@@ -40,7 +42,8 @@ int main(int argc, char *argv[])
int opt, ret, status, heapid;
int sockfd, client_fd, shared_fd;
unsigned char *map_buf;
- unsigned long map_len, heap_type, heap_size, flags;
+ unsigned long map_len, heap_size, flags;
+ long heap_type;
struct ion_buffer_info info;
struct socket_info skinfo;
@@ -50,6 +53,7 @@ int main(int argc, char *argv[])
}
heap_size = 0;
+ heap_type = -1;
flags = 0;
while ((opt = getopt(argc, argv, "hi:s:")) != -1) {
@@ -68,7 +72,7 @@ int main(int argc, char *argv[])
heap_type = ION_HEAP_TYPE_SYSTEM_CONTIG;
break;
default:
- printf("ERROR: heap type not supported\n");
+ print_usage(argc, argv);
exit(1);
}
break;
@@ -82,8 +86,7 @@ int main(int argc, char *argv[])
}
}
- if (heap_size <= 0) {
- printf("heap_size cannot be 0\n");
+ if (heap_size <= 0 || heap_type < 0) {
print_usage(argc, argv);
exit(1);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2] selftests/android/ion: fix heap_type may be uninitialized
@ 2018-04-05 7:39 ` anders.roxell
0 siblings, 0 replies; 15+ messages in thread
From: anders.roxell @ 2018-04-05 7:39 UTC (permalink / raw)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2582 bytes --]
gcc warns that 'heap_type' is not initialized if we don't come through
any of the two 'case' statesments before:
ionapp_export.c:91:2: warning: ‘heap_type’ may be used uninitialized in
this function [-Wmaybe-uninitialized]
printf("heap_type: %ld, heap_size: %ld\n", heap_type, heap_size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In the current code, we initialize the heap_type to -1 before the 'case'
statements. We also change the print_usage function to state that
heap_type and heap_size isn't optional, they are mandatory.
Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing")
Signed-off-by: Anders Roxell <anders.roxell at linaro.org>
---
tools/testing/selftests/android/ion/ionapp_export.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/android/ion/ionapp_export.c b/tools/testing/selftests/android/ion/ionapp_export.c
index a944e72621a9..67a0263a7f28 100644
--- a/tools/testing/selftests/android/ion/ionapp_export.c
+++ b/tools/testing/selftests/android/ion/ionapp_export.c
@@ -31,8 +31,10 @@
void print_usage(int argc, char *argv[])
{
- printf("Usage: %s [-h <help>] [-i <heap id>] [-s <size in bytes>]\n",
+ printf("Usage: %s [-h <help>] -i <heap id> -s <size in bytes>\n",
argv[0]);
+ printf(" Supported heap id's 0 or 1\n");
+ printf(" Heap size > 0\n");
}
int main(int argc, char *argv[])
@@ -40,7 +42,8 @@ int main(int argc, char *argv[])
int opt, ret, status, heapid;
int sockfd, client_fd, shared_fd;
unsigned char *map_buf;
- unsigned long map_len, heap_type, heap_size, flags;
+ unsigned long map_len, heap_size, flags;
+ long heap_type;
struct ion_buffer_info info;
struct socket_info skinfo;
@@ -50,6 +53,7 @@ int main(int argc, char *argv[])
}
heap_size = 0;
+ heap_type = -1;
flags = 0;
while ((opt = getopt(argc, argv, "hi:s:")) != -1) {
@@ -68,7 +72,7 @@ int main(int argc, char *argv[])
heap_type = ION_HEAP_TYPE_SYSTEM_CONTIG;
break;
default:
- printf("ERROR: heap type not supported\n");
+ print_usage(argc, argv);
exit(1);
}
break;
@@ -82,8 +86,7 @@ int main(int argc, char *argv[])
}
}
- if (heap_size <= 0) {
- printf("heap_size cannot be 0\n");
+ if (heap_size <= 0 || heap_type < 0) {
print_usage(argc, argv);
exit(1);
}
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v2] selftests/android/ion: fix heap_type may be uninitialized
@ 2018-04-05 7:39 ` anders.roxell
0 siblings, 0 replies; 15+ messages in thread
From: Anders Roxell @ 2018-04-05 7:39 UTC (permalink / raw)
gcc warns that 'heap_type' is not initialized if we don't come through
any of the two 'case' statesments before:
ionapp_export.c:91:2: warning: ‘heap_type’ may be used uninitialized in
this function [-Wmaybe-uninitialized]
printf("heap_type: %ld, heap_size: %ld\n", heap_type, heap_size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In the current code, we initialize the heap_type to -1 before the 'case'
statements. We also change the print_usage function to state that
heap_type and heap_size isn't optional, they are mandatory.
Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing")
Signed-off-by: Anders Roxell <anders.roxell at linaro.org>
---
tools/testing/selftests/android/ion/ionapp_export.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/android/ion/ionapp_export.c b/tools/testing/selftests/android/ion/ionapp_export.c
index a944e72621a9..67a0263a7f28 100644
--- a/tools/testing/selftests/android/ion/ionapp_export.c
+++ b/tools/testing/selftests/android/ion/ionapp_export.c
@@ -31,8 +31,10 @@
void print_usage(int argc, char *argv[])
{
- printf("Usage: %s [-h <help>] [-i <heap id>] [-s <size in bytes>]\n",
+ printf("Usage: %s [-h <help>] -i <heap id> -s <size in bytes>\n",
argv[0]);
+ printf(" Supported heap id's 0 or 1\n");
+ printf(" Heap size > 0\n");
}
int main(int argc, char *argv[])
@@ -40,7 +42,8 @@ int main(int argc, char *argv[])
int opt, ret, status, heapid;
int sockfd, client_fd, shared_fd;
unsigned char *map_buf;
- unsigned long map_len, heap_type, heap_size, flags;
+ unsigned long map_len, heap_size, flags;
+ long heap_type;
struct ion_buffer_info info;
struct socket_info skinfo;
@@ -50,6 +53,7 @@ int main(int argc, char *argv[])
}
heap_size = 0;
+ heap_type = -1;
flags = 0;
while ((opt = getopt(argc, argv, "hi:s:")) != -1) {
@@ -68,7 +72,7 @@ int main(int argc, char *argv[])
heap_type = ION_HEAP_TYPE_SYSTEM_CONTIG;
break;
default:
- printf("ERROR: heap type not supported\n");
+ print_usage(argc, argv);
exit(1);
}
break;
@@ -82,8 +86,7 @@ int main(int argc, char *argv[])
}
}
- if (heap_size <= 0) {
- printf("heap_size cannot be 0\n");
+ if (heap_size <= 0 || heap_type < 0) {
print_usage(argc, argv);
exit(1);
}
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2] selftests/android/ion: fix heap_type may be uninitialized
2018-04-05 7:39 ` anders.roxell
(?)
@ 2018-04-06 17:42 ` pintu.ping
-1 siblings, 0 replies; 15+ messages in thread
From: Pintu Kumar @ 2018-04-06 17:42 UTC (permalink / raw)
To: Anders Roxell; +Cc: Shuah Khan, linux-kselftest, open list
On Thu, Apr 5, 2018 at 1:09 PM, Anders Roxell <anders.roxell@linaro.org> wrote:
> gcc warns that 'heap_type' is not initialized if we don't come through
> any of the two 'case' statesments before:
>
> ionapp_export.c:91:2: warning: ‘heap_type’ may be used uninitialized in
> this function [-Wmaybe-uninitialized]
> printf("heap_type: %ld, heap_size: %ld\n", heap_type, heap_size);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> In the current code, we initialize the heap_type to -1 before the 'case'
> statements. We also change the print_usage function to state that
> heap_type and heap_size isn't optional, they are mandatory.
>
> Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing")
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
> ---
> tools/testing/selftests/android/ion/ionapp_export.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/tools/testing/selftests/android/ion/ionapp_export.c b/tools/testing/selftests/android/ion/ionapp_export.c
> index a944e72621a9..67a0263a7f28 100644
> --- a/tools/testing/selftests/android/ion/ionapp_export.c
> +++ b/tools/testing/selftests/android/ion/ionapp_export.c
> @@ -31,8 +31,10 @@
>
> void print_usage(int argc, char *argv[])
> {
> - printf("Usage: %s [-h <help>] [-i <heap id>] [-s <size in bytes>]\n",
> + printf("Usage: %s [-h <help>] -i <heap id> -s <size in bytes>\n",
> argv[0]);
> + printf(" Supported heap id's 0 or 1\n");
> + printf(" Heap size > 0\n");
> }
>
> int main(int argc, char *argv[])
> @@ -40,7 +42,8 @@ int main(int argc, char *argv[])
> int opt, ret, status, heapid;
> int sockfd, client_fd, shared_fd;
> unsigned char *map_buf;
> - unsigned long map_len, heap_type, heap_size, flags;
> + unsigned long map_len, heap_size, flags;
> + long heap_type;
> struct ion_buffer_info info;
> struct socket_info skinfo;
>
> @@ -50,6 +53,7 @@ int main(int argc, char *argv[])
> }
>
> heap_size = 0;
> + heap_type = -1;
> flags = 0;
>
To make it simple, I would suggest, let the default heap_type be 0.
Actually that was my original intention but I would have missed it
during submission.
In that case nothing below is required to change.
> while ((opt = getopt(argc, argv, "hi:s:")) != -1) {
> @@ -68,7 +72,7 @@ int main(int argc, char *argv[])
> heap_type = ION_HEAP_TYPE_SYSTEM_CONTIG;
> break;
> default:
> - printf("ERROR: heap type not supported\n");
> + print_usage(argc, argv);
> exit(1);
> }
> break;
> @@ -82,8 +86,7 @@ int main(int argc, char *argv[])
> }
> }
>
> - if (heap_size <= 0) {
> - printf("heap_size cannot be 0\n");
> + if (heap_size <= 0 || heap_type < 0) {
> print_usage(argc, argv);
> exit(1);
> }
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2] selftests/android/ion: fix heap_type may be uninitialized
@ 2018-04-06 17:42 ` pintu.ping
0 siblings, 0 replies; 15+ messages in thread
From: pintu.ping @ 2018-04-06 17:42 UTC (permalink / raw)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 3387 bytes --]
On Thu, Apr 5, 2018 at 1:09 PM, Anders Roxell <anders.roxell at linaro.org> wrote:
> gcc warns that 'heap_type' is not initialized if we don't come through
> any of the two 'case' statesments before:
>
> ionapp_export.c:91:2: warning: ‘heap_type’ may be used uninitialized in
> this function [-Wmaybe-uninitialized]
> printf("heap_type: %ld, heap_size: %ld\n", heap_type, heap_size);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> In the current code, we initialize the heap_type to -1 before the 'case'
> statements. We also change the print_usage function to state that
> heap_type and heap_size isn't optional, they are mandatory.
>
> Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing")
> Signed-off-by: Anders Roxell <anders.roxell at linaro.org>
> ---
> tools/testing/selftests/android/ion/ionapp_export.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/tools/testing/selftests/android/ion/ionapp_export.c b/tools/testing/selftests/android/ion/ionapp_export.c
> index a944e72621a9..67a0263a7f28 100644
> --- a/tools/testing/selftests/android/ion/ionapp_export.c
> +++ b/tools/testing/selftests/android/ion/ionapp_export.c
> @@ -31,8 +31,10 @@
>
> void print_usage(int argc, char *argv[])
> {
> - printf("Usage: %s [-h <help>] [-i <heap id>] [-s <size in bytes>]\n",
> + printf("Usage: %s [-h <help>] -i <heap id> -s <size in bytes>\n",
> argv[0]);
> + printf(" Supported heap id's 0 or 1\n");
> + printf(" Heap size > 0\n");
> }
>
> int main(int argc, char *argv[])
> @@ -40,7 +42,8 @@ int main(int argc, char *argv[])
> int opt, ret, status, heapid;
> int sockfd, client_fd, shared_fd;
> unsigned char *map_buf;
> - unsigned long map_len, heap_type, heap_size, flags;
> + unsigned long map_len, heap_size, flags;
> + long heap_type;
> struct ion_buffer_info info;
> struct socket_info skinfo;
>
> @@ -50,6 +53,7 @@ int main(int argc, char *argv[])
> }
>
> heap_size = 0;
> + heap_type = -1;
> flags = 0;
>
To make it simple, I would suggest, let the default heap_type be 0.
Actually that was my original intention but I would have missed it
during submission.
In that case nothing below is required to change.
> while ((opt = getopt(argc, argv, "hi:s:")) != -1) {
> @@ -68,7 +72,7 @@ int main(int argc, char *argv[])
> heap_type = ION_HEAP_TYPE_SYSTEM_CONTIG;
> break;
> default:
> - printf("ERROR: heap type not supported\n");
> + print_usage(argc, argv);
> exit(1);
> }
> break;
> @@ -82,8 +86,7 @@ int main(int argc, char *argv[])
> }
> }
>
> - if (heap_size <= 0) {
> - printf("heap_size cannot be 0\n");
> + if (heap_size <= 0 || heap_type < 0) {
> print_usage(argc, argv);
> exit(1);
> }
> --
> 2.11.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2] selftests/android/ion: fix heap_type may be uninitialized
@ 2018-04-06 17:42 ` pintu.ping
0 siblings, 0 replies; 15+ messages in thread
From: Pintu Kumar @ 2018-04-06 17:42 UTC (permalink / raw)
On Thu, Apr 5, 2018@1:09 PM, Anders Roxell <anders.roxell@linaro.org> wrote:
> gcc warns that 'heap_type' is not initialized if we don't come through
> any of the two 'case' statesments before:
>
> ionapp_export.c:91:2: warning: ‘heap_type’ may be used uninitialized in
> this function [-Wmaybe-uninitialized]
> printf("heap_type: %ld, heap_size: %ld\n", heap_type, heap_size);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> In the current code, we initialize the heap_type to -1 before the 'case'
> statements. We also change the print_usage function to state that
> heap_type and heap_size isn't optional, they are mandatory.
>
> Fixes: 47a18c42d992 ("android/ion: userspace test utility for ion buffer sharing")
> Signed-off-by: Anders Roxell <anders.roxell at linaro.org>
> ---
> tools/testing/selftests/android/ion/ionapp_export.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/tools/testing/selftests/android/ion/ionapp_export.c b/tools/testing/selftests/android/ion/ionapp_export.c
> index a944e72621a9..67a0263a7f28 100644
> --- a/tools/testing/selftests/android/ion/ionapp_export.c
> +++ b/tools/testing/selftests/android/ion/ionapp_export.c
> @@ -31,8 +31,10 @@
>
> void print_usage(int argc, char *argv[])
> {
> - printf("Usage: %s [-h <help>] [-i <heap id>] [-s <size in bytes>]\n",
> + printf("Usage: %s [-h <help>] -i <heap id> -s <size in bytes>\n",
> argv[0]);
> + printf(" Supported heap id's 0 or 1\n");
> + printf(" Heap size > 0\n");
> }
>
> int main(int argc, char *argv[])
> @@ -40,7 +42,8 @@ int main(int argc, char *argv[])
> int opt, ret, status, heapid;
> int sockfd, client_fd, shared_fd;
> unsigned char *map_buf;
> - unsigned long map_len, heap_type, heap_size, flags;
> + unsigned long map_len, heap_size, flags;
> + long heap_type;
> struct ion_buffer_info info;
> struct socket_info skinfo;
>
> @@ -50,6 +53,7 @@ int main(int argc, char *argv[])
> }
>
> heap_size = 0;
> + heap_type = -1;
> flags = 0;
>
To make it simple, I would suggest, let the default heap_type be 0.
Actually that was my original intention but I would have missed it
during submission.
In that case nothing below is required to change.
> while ((opt = getopt(argc, argv, "hi:s:")) != -1) {
> @@ -68,7 +72,7 @@ int main(int argc, char *argv[])
> heap_type = ION_HEAP_TYPE_SYSTEM_CONTIG;
> break;
> default:
> - printf("ERROR: heap type not supported\n");
> + print_usage(argc, argv);
> exit(1);
> }
> break;
> @@ -82,8 +86,7 @@ int main(int argc, char *argv[])
> }
> }
>
> - if (heap_size <= 0) {
> - printf("heap_size cannot be 0\n");
> + if (heap_size <= 0 || heap_type < 0) {
> print_usage(argc, argv);
> exit(1);
> }
> --
> 2.11.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2] selftests/android/ion: fix heap_type may be uninitialized
2018-04-05 7:39 ` anders.roxell
(?)
@ 2018-04-09 3:36 ` Alexander.Levin
-1 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2018-04-09 3:36 UTC (permalink / raw)
To: Sasha Levin, Anders Roxell, shuah, pintu.ping
Cc: linux-kselftest, linux-kernel, stable
Hi,
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag,
fixing commit: 47a18c42d992 android/ion: userspace test utility for ion buffer sharing.
The bot has also determined it's probably a bug fixing patch. (score: 30.2608)
The bot has tested the following trees: v4.16, v4.15.15.
v4.16: Build OK!
v4.15.15: Build OK!
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2] selftests/android/ion: fix heap_type may be uninitialized
@ 2018-04-09 3:36 ` Alexander.Levin
0 siblings, 0 replies; 15+ messages in thread
From: Alexander.Levin @ 2018-04-09 3:36 UTC (permalink / raw)
Hi,
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag,
fixing commit: 47a18c42d992 android/ion: userspace test utility for ion buffer sharing.
The bot has also determined it's probably a bug fixing patch. (score: 30.2608)
The bot has tested the following trees: v4.16, v4.15.15.
v4.16: Build OK!
v4.15.15: Build OK!
--
Thanks,
Sasha--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2] selftests/android/ion: fix heap_type may be uninitialized
@ 2018-04-09 3:36 ` Alexander.Levin
0 siblings, 0 replies; 15+ messages in thread
From: Sasha Levin @ 2018-04-09 3:36 UTC (permalink / raw)
Hi,
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag,
fixing commit: 47a18c42d992 android/ion: userspace test utility for ion buffer sharing.
The bot has also determined it's probably a bug fixing patch. (score: 30.2608)
The bot has tested the following trees: v4.16, v4.15.15.
v4.16: Build OK!
v4.15.15: Build OK!
--
Thanks,
Sasha--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2018-04-09 3:36 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-08 13:48 [PATCH] selftests/android/ion: fix heap_type may be uninitialized Anders Roxell
2018-03-08 13:48 ` Anders Roxell
2018-03-08 13:48 ` anders.roxell
2018-03-16 10:14 ` Pintu Kumar
2018-03-16 10:14 ` Pintu Kumar
2018-03-16 10:14 ` pintu.ping
2018-04-05 7:39 ` [PATCH v2] " Anders Roxell
2018-04-05 7:39 ` Anders Roxell
2018-04-05 7:39 ` anders.roxell
2018-04-06 17:42 ` Pintu Kumar
2018-04-06 17:42 ` Pintu Kumar
2018-04-06 17:42 ` pintu.ping
2018-04-09 3:36 ` Sasha Levin
2018-04-09 3:36 ` Sasha Levin
2018-04-09 3:36 ` Alexander.Levin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.