All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nicolas Iooss <nicolas.iooss@m4x.org>
To: Smalley <stephen.smalley.work@gmail.com>
Cc: SElinux list <selinux@vger.kernel.org>
Subject: Re: [PATCH] libsemanage: fsync before rename
Date: Wed, 13 May 2020 20:52:20 +0200	[thread overview]
Message-ID: <CAJfZ7=mvfqdh_5KFff7itT3m3FPVnMpcG8_kn+U3EYOw8KebiA@mail.gmail.com> (raw)
In-Reply-To: <5ebc4079.1c69fb81.c8782.38eb@mx.google.com>

On Wed, May 13, 2020 at 8:46 PM Smalley <stephen.smalley.work@gmail.com> wrote:
>
> From: Stephen Smalley <stephen.smalley.work@gmail.com>
>
> Prior to rename(2)'ing new files into place, fsync(2) them to ensure
> the contents will be fully written prior to rename.  While we are here,
> also fix checking of write(2) to detect short writes.  This code could
> be more generally improved but keeping to the minimal changes required
> to fix this bug.
>
> Fixes: https://github.com/SELinuxProject/selinux/issues/237
> Signed-off-by: Stephen Smalley <stephen.smalley.work@gmail.com>
> ---
>  libsemanage/src/semanage_store.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/libsemanage/src/semanage_store.c b/libsemanage/src/semanage_store.c
> index 859c0a22..3cac36d4 100644
> --- a/libsemanage/src/semanage_store.c
> +++ b/libsemanage/src/semanage_store.c
> @@ -735,7 +735,7 @@ int semanage_copy_file(const char *src, const char *dst, mode_t mode)
>         }
>         umask(mask);
>         while (retval == 0 && (amount_read = read(in, buf, sizeof(buf))) > 0) {
> -               if (write(out, buf, amount_read) < 0) {
> +               if (write(out, buf, amount_read) != amount_read) {
>                         errsv = errno;
>                         retval = -1;
>                 }

If I remember correctly, errno is not defined if a short write
happens. If this is confirmed and if you want to keep the patch short,
you could for example use errsv = EIO if write() returned a value
different from -1 and from amount_read.

Thanks,
Nicolas

> @@ -745,6 +745,10 @@ int semanage_copy_file(const char *src, const char *dst, mode_t mode)
>                 retval = -1;
>         }
>         close(in);
> +       if (fsync(out) < 0) {
> +               errsv = errno;
> +               retval = -1;
> +       }
>         if (close(out) < 0) {
>                 errsv = errno;
>                 retval = -1;
> --
> 2.23.3
>


  reply	other threads:[~2020-05-13 18:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-13 18:46 Smalley
2020-05-13 18:52 ` Nicolas Iooss [this message]
2020-05-13 19:08   ` Stephen Smalley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAJfZ7=mvfqdh_5KFff7itT3m3FPVnMpcG8_kn+U3EYOw8KebiA@mail.gmail.com' \
    --to=nicolas.iooss@m4x.org \
    --cc=selinux@vger.kernel.org \
    --cc=stephen.smalley.work@gmail.com \
    --subject='Re: [PATCH] libsemanage: fsync before rename' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.