From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Pablo Neira Ayuso <pablo@netfilter•org>,
NetFilter <netfilter-devel@vger•kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Eric Sesterhenn <eric.sesterhenn@x41-dsec•de>,
Varsha Rao <rvarsha016@gmail•com>
Subject: linux-next: manual merge of the netfilter-next tree with the netfilter tree
Date: Thu, 7 Dec 2017 12:58:11 +1100 [thread overview]
Message-ID: <20171207125811.550421ae@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the netfilter-next tree got a conflict in:
net/netfilter/nf_conntrack_h323_asn1.c
between commit:
bc7d811ace4a ("netfilter: nf_ct_h323: Convert CHECK_BOUND macro to function")
from the netfilter tree and commit:
e3e52b49c9e7 ("netfilter: nf_conntrack_h323: Remove unwanted comments.")
from the netfilter-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc net/netfilter/nf_conntrack_h323_asn1.c
index dc6347342e34,475fc8a9b477..000000000000
--- a/net/netfilter/nf_conntrack_h323_asn1.c
+++ b/net/netfilter/nf_conntrack_h323_asn1.c
@@@ -164,20 -166,6 +165,19 @@@ static unsigned int get_len(struct bits
return v;
}
+static int nf_h323_error_boundary(struct bitstr *bs, size_t bytes, size_t bits)
+{
+ bits += bs->bit;
+ bytes += bits / BITS_PER_BYTE;
+ if (bits % BITS_PER_BYTE > 0)
+ bytes++;
+
+ if (*bs->cur + bytes > *bs->end)
+ return 1;
+
+ return 0;
+}
+
- /****************************************************************************/
static unsigned int get_bit(struct bitstr *bs)
{
unsigned int b = (*bs->cur) & (0x80 >> bs->bit);
next reply other threads:[~2017-12-07 1:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-07 1:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-05-24 16:19 linux-next: manual merge of the netfilter-next tree with the netfilter tree Mark Brown
2019-04-15 1:22 Stephen Rothwell
2019-04-16 1:26 ` Stephen Rothwell
2021-10-15 2:00 Stephen Rothwell
2021-10-18 23:13 ` Stephen Rothwell
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=20171207125811.550421ae@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=eric.sesterhenn@x41-dsec$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
--cc=pablo@netfilter$(echo .)org \
--cc=rvarsha016@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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