Re: svn commit: r320277 - head/usr.bin/mkuzip

[Ngie Cooper (yaneurabeya)]

> On Jun 23, 2017, at 16:51, Glen Barber  wrote:
> 
> On Fri, Jun 23, 2017 at 03:54:35PM -0700, Conrad Meyer wrote:
>>> @@ -58,12 +59,15 @@ mkuz_get_insize(struct mkuz_cfg *cfp)
>>>ffd = open(statfsbuf.f_mntfromname, O_RDONLY);
>>>if (ffd < 0) {
>>>warn("open(%s, O_RDONLY)", statfsbuf.f_mntfromname);
>>> +   close(ffd);
>> 
>> This one is wrong for obvious reasons.
>> 
> 
> It isn't obvious to me.  :)

open failed, so closing ffd == -1 is a programming error (but admittedly, 
pretty benign).
-Ngie


signature.asc
Description: Message signed with OpenPGP using GPGMail

Re: svn commit: r320277 - head/usr.bin/mkuzip

[Glen Barber]

On Fri, Jun 23, 2017 at 03:54:35PM -0700, Conrad Meyer wrote:
> > @@ -58,12 +59,15 @@ mkuz_get_insize(struct mkuz_cfg *cfp)
> > ffd = open(statfsbuf.f_mntfromname, O_RDONLY);
> > if (ffd < 0) {
> > warn("open(%s, O_RDONLY)", statfsbuf.f_mntfromname);
> > +   close(ffd);
> 
> This one is wrong for obvious reasons.
> 

It isn't obvious to me.  :)

Glen



signature.asc
Description: PGP signature

Re: svn commit: r320277 - head/usr.bin/mkuzip

[Maxim Sobolev]

Yeah, silly me. Thanks^2.

-Max

On Fri, Jun 23, 2017 at 3:54 PM, Conrad Meyer  wrote:

> One more nit.
>
> On Fri, Jun 23, 2017 at 10:39 AM, Maxim Sobolev 
> wrote:
> > Author: sobomax
> > Date: Fri Jun 23 17:39:00 2017
> > New Revision: 320277
> > URL: https://svnweb.freebsd.org/changeset/base/320277
> >
> > Log:
> >   Don't leak file descriptor in some cases.
> >
> >   Reported by:  cem
> >   MFC after:6 weeks
> >
> > Modified:
> >   head/usr.bin/mkuzip/mkuz_insize.c
> >
> > Modified: head/usr.bin/mkuzip/mkuz_insize.c
> > 
> ==
> > --- head/usr.bin/mkuzip/mkuz_insize.c   Fri Jun 23 17:31:07 2017
> (r320276)
> > +++ head/usr.bin/mkuzip/mkuz_insize.c   Fri Jun 23 17:39:00 2017
> (r320277)
> > @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
> >  #include 
> >  #include 
> >  #include 
> > +#include 
> >
> >  #include "mkuz_cfg.h"
> >  #include "mkuz_insize.h"
> > @@ -58,12 +59,15 @@ mkuz_get_insize(struct mkuz_cfg *cfp)
> > ffd = open(statfsbuf.f_mntfromname, O_RDONLY);
> > if (ffd < 0) {
> > warn("open(%s, O_RDONLY)",
> statfsbuf.f_mntfromname);
> > +   close(ffd);
>
> This one is wrong for obvious reasons.
>
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r320277 - head/usr.bin/mkuzip

[Conrad Meyer]

One more nit.

On Fri, Jun 23, 2017 at 10:39 AM, Maxim Sobolev  wrote:
> Author: sobomax
> Date: Fri Jun 23 17:39:00 2017
> New Revision: 320277
> URL: https://svnweb.freebsd.org/changeset/base/320277
>
> Log:
>   Don't leak file descriptor in some cases.
>
>   Reported by:  cem
>   MFC after:6 weeks
>
> Modified:
>   head/usr.bin/mkuzip/mkuz_insize.c
>
> Modified: head/usr.bin/mkuzip/mkuz_insize.c
> ==
> --- head/usr.bin/mkuzip/mkuz_insize.c   Fri Jun 23 17:31:07 2017
> (r320276)
> +++ head/usr.bin/mkuzip/mkuz_insize.c   Fri Jun 23 17:39:00 2017
> (r320277)
> @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
>  #include 
>  #include 
>  #include 
> +#include 
>
>  #include "mkuz_cfg.h"
>  #include "mkuz_insize.h"
> @@ -58,12 +59,15 @@ mkuz_get_insize(struct mkuz_cfg *cfp)
> ffd = open(statfsbuf.f_mntfromname, O_RDONLY);
> if (ffd < 0) {
> warn("open(%s, O_RDONLY)", statfsbuf.f_mntfromname);
> +   close(ffd);

This one is wrong for obvious reasons.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r320277 - head/usr.bin/mkuzip

[Maxim Sobolev]

Author: sobomax
Date: Fri Jun 23 17:39:00 2017
New Revision: 320277
URL: https://svnweb.freebsd.org/changeset/base/320277

Log:
  Don't leak file descriptor in some cases.
  
  Reported by:  cem
  MFC after:6 weeks

Modified:
  head/usr.bin/mkuzip/mkuz_insize.c

Modified: head/usr.bin/mkuzip/mkuz_insize.c
==
--- head/usr.bin/mkuzip/mkuz_insize.c   Fri Jun 23 17:31:07 2017
(r320276)
+++ head/usr.bin/mkuzip/mkuz_insize.c   Fri Jun 23 17:39:00 2017
(r320277)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 
 #include "mkuz_cfg.h"
 #include "mkuz_insize.h"
@@ -58,12 +59,15 @@ mkuz_get_insize(struct mkuz_cfg *cfp)
ffd = open(statfsbuf.f_mntfromname, O_RDONLY);
if (ffd < 0) {
warn("open(%s, O_RDONLY)", statfsbuf.f_mntfromname);
+   close(ffd);
return (-1);
}
if (ioctl(ffd, DIOCGMEDIASIZE, &ms) < 0) {
warn("ioctl(DIOCGMEDIASIZE)");
+   close(ffd);
return (-1);
}
+   close(ffd);
sb.st_size = ms;
} else if (S_ISCHR(sb.st_mode)) {
if (ioctl(cfp->fdr, DIOCGMEDIASIZE, &ms) < 0) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"