Re: [PATCH 8/9] minor kstrdup_quotable simplification

2019-09-05 Thread Kees Cook
On Thu, Sep 05, 2019 at 03:44:32PM -0400, J. Bruce Fields wrote:
> From: "J. Bruce Fields" 
> 
> ---
>  lib/string_helpers.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

I think this can be folded into patch 7.

> 
> diff --git a/lib/string_helpers.c b/lib/string_helpers.c
> index 47f40406f9d4..6f553f893fda 100644
> --- a/lib/string_helpers.c
> +++ b/lib/string_helpers.c
> @@ -518,8 +518,8 @@ char *kstrdup_quotable(const char *src, gfp_t gfp)
>  {
>   size_t slen, dlen;
>   char *dst;
> - const int flags = ESCAPE_STYLE_HEX;
> - const char esc[] = "\f\n\r\t\v\a\e\\\"";
> + const int flags = ESCAPE_SPECIAL|ESCAPE_STYLE_HEX;
> + const char esc[] = "\"";
>  
>   if (!src)
>   return NULL;
> -- 
> 2.21.0
> 

-- 
Kees Cook


[PATCH 8/9] minor kstrdup_quotable simplification

2019-09-05 Thread J. Bruce Fields
From: "J. Bruce Fields" 

---
 lib/string_helpers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index 47f40406f9d4..6f553f893fda 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -518,8 +518,8 @@ char *kstrdup_quotable(const char *src, gfp_t gfp)
 {
size_t slen, dlen;
char *dst;
-   const int flags = ESCAPE_STYLE_HEX;
-   const char esc[] = "\f\n\r\t\v\a\e\\\"";
+   const int flags = ESCAPE_SPECIAL|ESCAPE_STYLE_HEX;
+   const char esc[] = "\"";
 
if (!src)
return NULL;
-- 
2.21.0