diff mbox

sunrpc: silence build warning in gss_fill_context

Message ID 1360250946-26745-1-git-send-email-jlayton@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jeff Layton Feb. 7, 2013, 3:29 p.m. UTC
Since commit 620038f6d23, gcc is throwing the following warning:

  CC [M]  net/sunrpc/auth_gss/auth_gss.o
In file included from include/linux/sunrpc/types.h:14:0,
                 from include/linux/sunrpc/sched.h:14,
                 from include/linux/sunrpc/clnt.h:18,
                 from net/sunrpc/auth_gss/auth_gss.c:45:
net/sunrpc/auth_gss/auth_gss.c: In function ‘gss_pipe_downcall’:
include/linux/sunrpc/debug.h:45:10: warning: ‘timeout’ may be used
uninitialized in this function [-Wmaybe-uninitialized]
    printk(KERN_DEFAULT args); \
          ^
net/sunrpc/auth_gss/auth_gss.c:194:15: note: ‘timeout’ was declared here
  unsigned int timeout;
               ^
If simple_get_bytes returns an error, then we'll end up calling printk
with an uninitialized timeout value. Reasonably harmless, but fairly
simple to fix by setting the timeout to 0 if it does.

Cc: Andy Adamson <andros@netapp.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 net/sunrpc/auth_gss/auth_gss.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Trond Myklebust Feb. 17, 2013, 8:32 p.m. UTC | #1
On Thu, 2013-02-07 at 10:29 -0500, Jeff Layton wrote:
> Since commit 620038f6d23, gcc is throwing the following warning:

> 

>   CC [M]  net/sunrpc/auth_gss/auth_gss.o

> In file included from include/linux/sunrpc/types.h:14:0,

>                  from include/linux/sunrpc/sched.h:14,

>                  from include/linux/sunrpc/clnt.h:18,

>                  from net/sunrpc/auth_gss/auth_gss.c:45:

> net/sunrpc/auth_gss/auth_gss.c: In function ‘gss_pipe_downcall’:

> include/linux/sunrpc/debug.h:45:10: warning: ‘timeout’ may be used

> uninitialized in this function [-Wmaybe-uninitialized]

>     printk(KERN_DEFAULT args); \

>           ^

> net/sunrpc/auth_gss/auth_gss.c:194:15: note: ‘timeout’ was declared here

>   unsigned int timeout;

>                ^

> If simple_get_bytes returns an error, then we'll end up calling printk

> with an uninitialized timeout value. Reasonably harmless, but fairly

> simple to fix by setting the timeout to 0 if it does.


 I'd prefer just doing a parameterectomy on the dprintk()... Do we
really need it to report anything other than just the error?

Cheers
  Trond
diff mbox

Patch

diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index 6e5c824..b706b4c 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -201,8 +201,10 @@  gss_fill_context(const void *p, const void *end, struct gss_cl_ctx *ctx, struct
 	 * the -t value passed to GSSD.
 	 */
 	p = simple_get_bytes(p, end, &timeout, sizeof(timeout));
-	if (IS_ERR(p))
+	if (IS_ERR(p)) {
+		timeout = 0;
 		goto err;
+	}
 	if (timeout == 0)
 		timeout = GSSD_MIN_TIMEOUT;
 	ctx->gc_expiry = now + ((unsigned long)timeout * HZ);