Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1518264

Re: [PATCH] drbd: Fix kernel_sendmsg() usage

Show all headers | View raw

On Tue, Nov 08, 2016 at 09:52:04AM -0700, Jens Axboe wrote:
> > > This should go into 4.9,
> > > and into all stable branches since and including v4.0,
> > > which is the first to contain the exposing change.
> > > 
> > > It is correct for all stable branches older than that as well
> > > (which contain the DRBD driver; which is 2.6.33 and up).
> > > 
> > > It requires a small "conflict" resolution for v4.4 and earlier, with v4.5
> > > we dropped the comment block immediately preceding the kernel_sendmsg().
> > > 
> > > Cc: stable@vger.kernel.org
> > > Cc: viro@zeniv.linux.org.uk
> > > Cc: christoph.lechleitner@iteg.at
> > > Cc: wolfgang.glas@iteg.at
> > > Reported-by: Christoph Lechleitner <christoph.lechleitner@iteg.at>
> > > Tested-by: Christoph Lechleitner <christoph.lechleitner@iteg.at>
> > > Signed-off-by: Richard Weinberger <richard@nod.at>
> > > Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
> > 
> > Changing my patch is perfectly fine, but please clearly state it.
> > I.e. by adding something like that before your S-o-b.
> > [Lars: Massaged patch to match my personal taste...]
> 

> Lars, are you sending a new one? If you do, add the stable tag as well.

So my "change" against his original patch was
- rv = kernel_sendmsg(sock, &msg, &iov, 1, size - sent);
+ rv = kernel_sendmsg(sock, &msg, &iov, 1, iov.iov_len);
to make it "more obviously correct" from looking just at the one line
without even having to read the context.  And a more verbose commit message.

If that requires yet additional noise, sure, so be it :)

Should I sent two patches, one that applies to 4.5 and later,
and one that applies to 2.6.33 ... 4.4, or are you or stable
willing to resolve the trivial "missing comment block" conflict yourself?

-- 
: Lars Ellenberg
: LINBIT | Keeping the Digital World Running
: DRBD -- Heartbeat -- Corosync -- Pacemaker
: R&D, Integration, Ops, Consulting, Support

DRBD® and LINBIT® are registered trademarks of LINBIT

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] drbd: Fix kernel_sendmsg() usage Richard Weinberger <richard@nod.at> - 2016-11-08 11:50 +0100
  Re: [PATCH] drbd: Fix kernel_sendmsg() usage Richard Weinberger <richard@nod.at> - 2016-11-08 15:00 +0100
    Re: [PATCH] drbd: Fix kernel_sendmsg() usage Jens Axboe <axboe@kernel.dk> - 2016-11-08 18:00 +0100
      Re: [PATCH] drbd: Fix kernel_sendmsg() usage Lars Ellenberg <lars.ellenberg@linbit.com> - 2016-11-09 16:40 +0100
        Re: [PATCH] drbd: Fix kernel_sendmsg() usage Richard Weinberger <richard@nod.at> - 2016-11-09 16:50 +0100
          Re: [Drbd-dev] [PATCH] drbd: Fix kernel_sendmsg() usage Lars Ellenberg <lars.ellenberg@linbit.com> - 2016-11-09 18:00 +0100
        Re: [PATCH] drbd: Fix kernel_sendmsg() usage Jens Axboe <axboe@kernel.dk> - 2016-11-09 18:00 +0100
          [PATCH v2] drbd: Fix kernel_sendmsg() usage - potential NULL deref Lars Ellenberg <lars.ellenberg@linbit.com> - 2016-11-09 23:00 +0100
            Re: [PATCH v2] drbd: Fix kernel_sendmsg() usage - potential NULL  deref Al Viro <viro@ZenIV.linux.org.uk> - 2016-11-10 00:50 +0100
  Re: [PATCH] drbd: Fix kernel_sendmsg() usage Christoph Lechleitner <christoph.lechleitner@iteg.at> - 2016-11-08 15:10 +0100
  Re: [PATCH] drbd: Fix kernel_sendmsg() usage Christoph Hellwig <hch@infradead.org> - 2016-11-08 16:50 +0100
    Re: [PATCH] drbd: Fix kernel_sendmsg() usage Richard Weinberger <richard@nod.at> - 2016-11-08 17:10 +0100
    Re: [PATCH] drbd: Fix kernel_sendmsg() usage Al Viro <viro@ZenIV.linux.org.uk> - 2016-11-08 17:20 +0100

csiph-web