[PATCH] rpc.idmapd: Sections in idmapd.conf are ignored.

[PATCH] rpc.idmapd: Sections in idmapd.conf are ignored.

[Steve Dickson]

In the parsing routine, conf_parse_line(), a string
is not being null terminated which is causing
section of the config file to be ignored.

https://bugzilla.linux-nfs.org/show_bug.cgi?id=205

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 support/nfs/conffile.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
index fa0dc6b..3990578 100644
--- a/support/nfs/conffile.c
+++ b/support/nfs/conffile.c
@@ -256,13 +256,14 @@ conf_parse_line(int trans, char *line, size_t sz)
 			val++, j++;
 		if (*val)
 			i = j;
-		section = malloc(i);
+		section = malloc(i+1);
 		if (!section) {
 			xlog_warn("conf_parse_line: %d: malloc (%lu) failed", ln,
 						(unsigned long)i);
 			return;
 		}
 		strncpy(section, line, i);
+		section[i] = '\0';
 
 		if (arg) 
 			free(arg);
-- 
1.7.7

Re: [PATCH] rpc.idmapd: Sections in idmapd.conf are ignored.

[Jim Rees]

Steve Dickson wrote:

  In the parsing routine, conf_parse_line(), a string
  is not being null terminated which is causing
  section of the config file to be ignored.
  
  https://bugzilla.linux-nfs.org/show_bug.cgi?id=205
  
  Signed-off-by: Steve Dickson <steved@redhat.com>
  ---
   support/nfs/conffile.c |    3 ++-
   1 files changed, 2 insertions(+), 1 deletions(-)
  
  diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
  index fa0dc6b..3990578 100644
  --- a/support/nfs/conffile.c
  +++ b/support/nfs/conffile.c
  @@ -256,13 +256,14 @@ conf_parse_line(int trans, char *line, size_t sz)
   			val++, j++;
   		if (*val)
   			i = j;
  -		section = malloc(i);
  +		section = malloc(i+1);
   		if (!section) {
   			xlog_warn("conf_parse_line: %d: malloc (%lu) failed", ln,
   						(unsigned long)i);
   			return;
   		}
   		strncpy(section, line, i);
  +		section[i] = '\0';
   
   		if (arg) 
   			free(arg);

Use of strdup() would not only make the code simpler but would eliminate the
possibility of introducing this kind of bug.

Re: [PATCH] rpc.idmapd: Sections in idmapd.conf are ignored.

[Steve Dickson]

On 11/14/2011 12:44 PM, Jim Rees wrote:
> Steve Dickson wrote:
> 
>   In the parsing routine, conf_parse_line(), a string
>   is not being null terminated which is causing
>   section of the config file to be ignored.
>   
>   https://bugzilla.linux-nfs.org/show_bug.cgi?id=205
>   
>   Signed-off-by: Steve Dickson <steved@redhat.com>
>   ---
>    support/nfs/conffile.c |    3 ++-
>    1 files changed, 2 insertions(+), 1 deletions(-)
>   
>   diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
>   index fa0dc6b..3990578 100644
>   --- a/support/nfs/conffile.c
>   +++ b/support/nfs/conffile.c
>   @@ -256,13 +256,14 @@ conf_parse_line(int trans, char *line, size_t sz)
>    			val++, j++;
>    		if (*val)
>    			i = j;
>   -		section = malloc(i);
>   +		section = malloc(i+1);
>    		if (!section) {
>    			xlog_warn("conf_parse_line: %d: malloc (%lu) failed", ln,
>    						(unsigned long)i);
>    			return;
>    		}
>    		strncpy(section, line, i);
>   +		section[i] = '\0';
>    
>    		if (arg) 
>    			free(arg);
> 
> Use of strdup() would not only make the code simpler but would eliminate the
> possibility of introducing this kind of bug.
I thought of that... but from my reading of the code
the entire string is not wanted, just a section of
the string is needed...  

thanks!

steved.

Re: [PATCH] rpc.idmapd: Sections in idmapd.conf are ignored.

[Steve Dickson]

On 11/14/2011 10:03 AM, Steve Dickson wrote:
> In the parsing routine, conf_parse_line(), a string
> is not being null terminated which is causing
> section of the config file to be ignored.
> 
> https://bugzilla.linux-nfs.org/show_bug.cgi?id=205
> 
> Signed-off-by: Steve Dickson <steved@redhat.com>
Committed...

steved.

> ---
>  support/nfs/conffile.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
> index fa0dc6b..3990578 100644
> --- a/support/nfs/conffile.c
> +++ b/support/nfs/conffile.c
> @@ -256,13 +256,14 @@ conf_parse_line(int trans, char *line, size_t sz)
>  			val++, j++;
>  		if (*val)
>  			i = j;
> -		section = malloc(i);
> +		section = malloc(i+1);
>  		if (!section) {
>  			xlog_warn("conf_parse_line: %d: malloc (%lu) failed", ln,
>  						(unsigned long)i);
>  			return;
>  		}
>  		strncpy(section, line, i);
> +		section[i] = '\0';
>  
>  		if (arg) 
>  			free(arg);