From nobody@FreeBSD.org  Thu Dec  8 21:53:00 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B40B1106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  8 Dec 2011 21:53:00 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B7028FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  8 Dec 2011 21:53:00 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id pB8Lr0pJ004970
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 8 Dec 2011 21:53:00 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id pB8Lr0PG004966;
	Thu, 8 Dec 2011 21:53:00 GMT
	(envelope-from nobody)
Message-Id: <201112082153.pB8Lr0PG004966@red.freebsd.org>
Date: Thu, 8 Dec 2011 21:53:00 GMT
From: Sascha Wildner <saw@online.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Wrong check in netsmb
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         163135
>Category:       kern
>Synopsis:       [netsmb] Wrong check in netsmb
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    brueffer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 08 22:00:20 UTC 2011
>Closed-Date:    Tue Jul 10 23:03:36 CEST 2012
>Last-Modified:  Tue Jul 10 21:10:12 UTC 2012
>Originator:     Sascha Wildner
>Release:        
>Organization:
>Environment:
>Description:
Looking at sys/netsmb/smb_trantcp.c I came across the check in line 526
which looks wrong (tv_sec checked twice).

Not 100% sure but I think the intention is to not pass a timeout of 0
so it seems as if it should be

if (ts2.tv_sec == 0 && ts2.tv_usec == 0)

but if changed that way it would lead to different timeouts which is why
I'm kinda unsure (assuming it works OK right now). :)

>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->brueffer 
Responsible-Changed-By: brueffer 
Responsible-Changed-When: Tue Jul 3 09:57:52 CEST 2012 
Responsible-Changed-Why:  
Grab this.  I talked to bp@ and will commit a fix when I come back next week. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163135 
State-Changed-From-To: open->closed 
State-Changed-By: brueffer 
State-Changed-When: Tue Jul 10 23:03:06 CEST 2012 
State-Changed-Why:  
Fix committed, thanks for the report! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163135 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/163135: commit references a PR
Date: Tue, 10 Jul 2012 21:03:15 +0000 (UTC)

 Author: brueffer
 Date: Tue Jul 10 21:02:59 2012
 New Revision: 238356
 URL: http://svn.freebsd.org/changeset/base/238356
 
 Log:
   Change a duplicated check to clarify that we really want to set a
   reasonable default timeout.
   
   PR:		163135
   Submitted by:	Sascha Wildner <saw@online.de>
   Suggested by:	bp
   Reviewed by:	bp
 
 Modified:
   head/sys/netsmb/smb_trantcp.c
 
 Modified: head/sys/netsmb/smb_trantcp.c
 ==============================================================================
 --- head/sys/netsmb/smb_trantcp.c	Tue Jul 10 20:59:35 2012	(r238355)
 +++ head/sys/netsmb/smb_trantcp.c	Tue Jul 10 21:02:59 2012	(r238356)
 @@ -523,8 +523,10 @@ smb_nbst_connect(struct smb_vc *vcp, str
  		return error;
  	getnanotime(&ts2);
  	timespecsub(&ts2, &ts1);
 -	if (ts2.tv_sec == 0 && ts2.tv_sec == 0)
 +	if (ts2.tv_sec == 0) {
  		ts2.tv_sec = 1;
 +		ts2.tv_nsec = 0;
 +	}
  	nbp->nbp_timo = ts2;
  	timespecadd(&nbp->nbp_timo, &ts2);
  	timespecadd(&nbp->nbp_timo, &ts2);
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
