netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dan Carpenter <dan.carpenter@oracle.com>
To: butt3rflyh4ck <butterflyhuangxx@gmail.com>
Cc: Manivannan Sadhasivam <mani@kernel.org>,
	Loic Poulain <loic.poulain@linaro.org>,
	"David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	Bjorn Andersson <bjorn.andersson@linaro.org>,
	linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH net-next] net: qrtr: make checks in qrtr_endpoint_post() stricter
Date: Fri, 27 Aug 2021 20:17:16 +0300	[thread overview]
Message-ID: <20210827171715.GO7722@kadam> (raw)
In-Reply-To: <CAFcO6XMo2rFJqb1zZyPgEDtChLHNq26WfhAd5WC+9NMnRNM8uw@mail.gmail.com>

On Fri, Aug 27, 2021 at 11:35:31PM +0800, butt3rflyh4ck wrote:
> On Fri, Aug 27, 2021 at 9:24 PM Dan Carpenter <dan.carpenter@oracle.com> wrote:
> >
> > These checks are still not strict enough.  The main problem is that if
> > "cb->type == QRTR_TYPE_NEW_SERVER" is true then "len - hdrlen" is
> > guaranteed to be 4 but we need to be at least 16 bytes.  In fact, we
> > can reject everything smaller than sizeof(*pkt) which is 20 bytes.
> >
> > Also I don't like the ALIGN(size, 4).  It's better to just insist that
> > data is needs to be aligned at the start.
> >
> > Fixes: 0baa99ee353c ("net: qrtr: Allow non-immediate node routing")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > This was from review.  Not tested.
> >
> >  net/qrtr/qrtr.c | 8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c
> > index b8508e35d20e..dbb647f5481b 100644
> > --- a/net/qrtr/qrtr.c
> > +++ b/net/qrtr/qrtr.c
> > @@ -493,7 +493,7 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len)
> >                 goto err;
> >         }
> >
> 
> > -       if (!size || len != ALIGN(size, 4) + hdrlen)
> > +       if (!size || size % 3 || len != size + hdrlen)
> 
> Hi, (size % 3)  is wrong, is it (size & 3), right ?
> 

Yeah.  Thanks for catching that.  I means & 3.

regards,
dan carpenter

  reply	other threads:[~2021-08-27 17:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-27 13:24 [PATCH net-next] net: qrtr: make checks in qrtr_endpoint_post() stricter Dan Carpenter
2021-08-27 15:35 ` butt3rflyh4ck
2021-08-27 17:17   ` Dan Carpenter [this message]
2021-08-30  8:37   ` [PATCH v2 net] " Dan Carpenter
2021-08-30 11:30     ` patchwork-bot+netdevbpf

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=20210827171715.GO7722@kadam \
    --to=dan.carpenter@oracle.com \
    --cc=bjorn.andersson@linaro.org \
    --cc=butterflyhuangxx@gmail.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=loic.poulain@linaro.org \
    --cc=mani@kernel.org \
    --cc=netdev@vger.kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).