From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752577AbdLGB6P (ORCPT ); Wed, 6 Dec 2017 20:58:15 -0500 Received: from ozlabs.org ([103.22.144.67]:40943 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752466AbdLGB6N (ORCPT ); Wed, 6 Dec 2017 20:58:13 -0500 Date: Thu, 7 Dec 2017 12:58:11 +1100 From: Stephen Rothwell To: Pablo Neira Ayuso , NetFilter Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Eric Sesterhenn , Varsha Rao Subject: linux-next: manual merge of the netfilter-next tree with the netfilter tree Message-ID: <20171207125811.550421ae@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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);