The master node contains hashes over the root index node and the LPT.
This patch adds a HMAC to authenticate the master node itself.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

The LPT needs to be authenticated aswell. Since the LPT is only written
during commit it is enough to authenticate the whole LPT with a single
hash which is stored in the master node. Only the leaf nodes (pnodes)
are hashed which makes the implementation much simpler than it would be
to hash the complete LPT.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

Make sure that during replay all buds can be authenticated. To do
this we calculate the hash chain until we find an authentication
node and check the HMAC in that node against the current status
of the hash chain.

After a power cut it can happen that some nodes have been written, but
not yet the authentication node for them. These nodes have to be
discarded during replay.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

To be able to authenticate the garbage collector journal head add
authentication nodes to the buds the garbage collector creates.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

Nodes that are written to flash can only be authenticated through the
index after the next commit. When a journal replay is necessary the
nodes are not yet referenced by the index and thus can't be
authenticated.

This patch overcomes this situation by creating a hash over all nodes
beginning from the commit start node over the reference node(s) and
the buds themselves. From
time to time we insert authentication nodes. Authentication nodes
contain a HMAC from the current hash state, so that they can be
used to authenticate a journal replay up to the point where the
authentication node is. The hash is continued afterwards
so that theoretically we would only have to check the HMAC of
the last authentication node we find.

Overall we get this picture:

,,,,,,,,
,......,...........................................
,. CS  ,               hash1.----.           hash2.----.
,.  |  ,                    .    |hmac            .    |hmac
,.  v  ,                    .    v                .    v
,.REF#0,-> bud -> bud -> bud.-> auth -> bud -> bud.-> auth ...
,..|...,...........................................
,  |   ,
,  |   ,,,,,,,,,,,,,,,
.  |            hash3,----.
,  |                 ,    |hmac
,  v                 ,    v
, REF#1 -> bud -> bud,-> auth ...
,,,|,,,,,,,,,,,,,,,,,,
   v
  REF#2 -> ...
   |
   V
  ...

Note how hash3 covers CS, REF#0 and REF#1 so that it is not possible to
exchange or skip any reference nodes. Unlike the picture suggests the
auth nodes themselves are not hashed.

With this it is possible for an offline attacker to cut each journal
head or to drop the last reference node(s), but not to skip any journal
heads or to reorder any operations.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

With this patch the hashes over the index nodes stored in the tree node
cache are written to flash and are checked when read back from flash.
The hash of the root index node is stored in the master node.

During journal replay the hashes are regenerated from the read nodes
and stored in the tree node cache. This means the nodes must previously
be authenticated by other means. This is done in a later patch.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

As part of the UBIFS authentication support every branch in the index
gets a hash covering the referenced node. To make that happen the tree
node cache needs hashes over the nodes. This patch adds a hash argument
to ubifs_tnc_add() and ubifs_tnc_add_nm(). The hashes are calculated
from the callers of these functions which actually prepare the nodes.
With this patch all the leaf nodes of the index tree get hashes, but
currently nothing is done with these hashes, this is left for a later
patch.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

With authentication support some nodes (master node, super block node)
get a HMAC embedded into them. This patch adds functions to prepare and
write such a node.
The difficulty is that besides the HMAC the nodes also have a CRC which
must stay valid. This means we first have to initialize all fields in
the node, then calculate the HMAC (not covering the CRC) and finally
calculate the CRC.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

This patch adds the various helper functions needed for authentication
support. We need functions to hash nodes, to embed HMACs into a node and
to compare hashes and HMACs. Most functions first check if this
filesystem is authenticated and bail out early if not, which makes the
functions safe to be called with disabled authentication.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

When adding authentication support we will embed a HMAC into some
nodes. To prepare these nodes we have to first initialize the nodes,
then add a HMAC and finally add a CRC. To accomplish this add separate
ubifs_init_node/ubifs_crc_node functions.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

This patch adds the changes to the on disk format needed for
authentication support. We'll add:

* a HMAC covering super block node
* a HMAC covering the master node
* a hash over the root index node to the master node
* a hash over the LPT to the master node
* a flag to the filesystem flag indicating the filesystem is
  authenticated
* an authentication node necessary to authenticate the nodes written
  to the journal heads while they are written.
* a HMAC of a well known message to the super block node to be able
  to check if the correct key is provided

And finally, not visible in this patch, nevertheless explained here:

* hashes over the referenced child nodes in each branch of a index node
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

The superblock node is read/modified/written several times throughout
the UBIFS code. Instead of reading it from the device each time just
keep a copy in memory and write back the modified copy when necessary.
This patch helps for authentication support, here we not only have to
read the superblock node, but also have to authenticate it, which
is easier if we do it once during initialization.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

write_node() is used only once and can easily be replaced with calls
to ubifs_prepare_node()/write_head() which makes the code a bit shorter.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

ubifs_lpt_lookup() starts by looking up the nth pnode in the LPT. We
already have this functionality in ubifs_pnode_lookup(). Use this
function rather than open coding its functionality.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

ubifs_lpt_lookup could be implemented using pnode_lookup. To make that
possible move pnode_lookup from lpt.c to lpt_commit.c. Rename it to
ubifs_pnode_lookup since it's now exported.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

read_znode() takes len, lnum and offs arguments which the caller all
extracts from the same struct ubifs_zbranch *. When adding authentication
support we would have to add a pointer to a hash to the arguments which
is also part of struct ubifs_zbranch. Pass the ubifs_zbranch * instead
so that we do not have to add another argument.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

try_read_node() takes len, lnum and offs arguments which the caller all
extracts from the same struct ubifs_zbranch *. When adding authentication
support we would have to add a pointer to a hash to the arguments which
is also part of struct ubifs_zbranch. Pass the ubifs_zbranch * instead
so that we do not have to add another argument.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

create_default_filesystem() allocates memory for a node, writes that
node and frees the memory directly afterwards. With this patch we
allocate memory for all nodes at the beginning of the function and
free the memory at the end. This makes it easier to implement
authentication support since with authentication support we'll need
the contents of some nodes when creating other nodes.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NRichard Weinberger <richard@nod.at>

In preparation to enabling -Wimplicit-fallthrough, mark switch cases
where we are expecting to fall through.

Addresses-Coverity-ID: 1373884 ("Missing break in switch")
Addresses-Coverity-ID: 114869 ("Missing break in switch")
Addresses-Coverity-ID: 114870 ("Missing break in switch")
Signed-off-by: NGustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: NRichard Weinberger <richard@nod.at>

As I introduced these files, I'm willing to be the maintainer of them as
well.
Acked-by: NChris Mason <clm@fb.com>
Acked-by: NOlof Johansson <olof@lixom.net>
Acked-by: NSteven Rostedt (VMware) <rostedt@goodmis.org>
Acked-by: NTheodore Ts'o <tytso@mit.edu>
Acked-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

The contact point for the kernel's Code of Conduct should now be the
Code of Conduct Committee, not the full TAB.  Change the email address
in the file to properly reflect this.
Acked-by: NChris Mason <clm@fb.com>
Acked-by: NOlof Johansson <olof@lixom.net>
Acked-by: NTheodore Ts'o <tytso@mit.edu>
Acked-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

There was a blank <URL> reference for how to find the Code of Conduct
Committee.  Fix that up by pointing it to the correct kernel.org website
page location.
Acked-by: NChris Mason <clm@fb.com>
Acked-by: NOlof Johansson <olof@lixom.net>
Acked-by: NTheodore Ts'o <tytso@mit.edu>
Acked-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Create a link between the Code of Conduct and the Code of Conduct
Interpretation so that people can see that they are related.
Acked-by: NChris Mason <clm@fb.com>
Acked-by: NOlof Johansson <olof@lixom.net>
Acked-by: NTheodore Ts'o <tytso@mit.edu>
Acked-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

We use the term "TAB" before defining it later in the document.  Fix
that up by defining it at the first location.
Reported-by: NKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: NChris Mason <clm@fb.com>
Acked-by: NOlof Johansson <olof@lixom.net>
Acked-by: NTheodore Ts'o <tytso@mit.edu>
Acked-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Code of Conduct Interpretation: Add document explaining how the Code of Conduct is to be interpreted

The Contributor Covenant Code of Conduct is a general document meant to
provide a set of rules for almost any open source community.  Every
open-source community is unique and the Linux kernel is no exception.
Because of this, this document describes how we in the Linux kernel
community will interpret it.  We also do not expect this interpretation
to be static over time, and will adjust it as needed.

This document was created with the input and feedback of the TAB as well
as many current kernel maintainers.
Co-Developed-by: NThomas Gleixner <tglx@linutronix.de>
Co-Developed-by: NOlof Johansson <olof@lixom.net>
Acked-by: NAlex Deucher <alexander.deucher@amd.com>
Acked-by: NAlexei Starovoitov <ast@kernel.org>
Acked-by: NAmir Goldstein <amir73il@gmail.com>
Acked-by: NAndrew Morton <akpm@linux-foundation.org>
Acked-by: NAndy Lutomirski <luto@kernel.org>
Acked-by: NAnna-Maria Gleixner <anna-maria@linutronix.de>
Acked-by: NArd Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: NBoris Brezillon <boris.brezillon@bootlin.com>
Acked-by: NBorislav Petkov <bp@kernel.org>
Acked-by: NChris Mason <clm@fb.com>
Acked-by: NChristian Lütke-Stetzkamp <christian@lkamp.de>
Acked-by: NColin Ian King <colin.king@canonical.com>
Acked-by: NDan Carpenter <dan.carpenter@oracle.com>
Acked-by: NDan Williams <dan.j.williams@intel.com>
Acked-by: NDaniel Borkmann <daniel@iogearbox.net>
Acked-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: NDave Airlie <airlied@redhat.com>
Acked-by: NDave Hansen <dave.hansen@linux.intel.com>
Acked-by: NDavid Ahern <dsa@cumulusnetworks.com>
Acked-by: NDavid Sterba <kdave@kernel.org>
Acked-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: NDominik Brodowski <linux@dominikbrodowski.de>
Acked-by: NEric Dumazet <eric.dumazet@gmail.com>
Acked-by: NFelipe Balbi <balbi@kernel.org>
Acked-by: NFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: NFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: NGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: NGrant Likely <grant.likely@secretlab.ca>
Acked-by: NGregory CLEMENT <gregory.clement@bootlin.com>
Acked-by: NGuenter Roeck <linux@roeck-us.net>
Acked-by: NGustavo A. R. Silva <gustavo@embeddedor.com>
Acked-by: NHans Verkuil <hverkuil@xs4all.nl>
Acked-by: NHans de Goede <j.w.r.degoede@gmail.com>
Acked-by: NHarry Wentland <harry.wentland@amd.com>
Acked-by: NHeiko Stuebner <heiko@sntech.de>
Acked-by: NIngo Molnar <mingo@kernel.org>
Acked-by: NJaegeuk Kim <jaegeuk@kernel.org>
Acked-by: NJames Smart <james.smart@broadcom.com>
Acked-by: NJames Smart <jsmart2021@gmail.com>
Acked-by: NJan Kara <jack@ucw.cz>
Acked-by: NJani Nikula <jani.nikula@intel.com>
Acked-by: NJason A. Donenfeld <Jason@zx2c4.com>
Acked-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: NJens Axboe <axboe@kernel.dk>
Acked-by: NJessica Yu <jeyu@kernel.org>
Acked-by: NJia-Ju Bai <baijiaju1990@gmail.com>
Acked-by: NJiri Kosina <jikos@kernel.org>
Acked-by: NJiri Olsa <jolsa@redhat.com>
Acked-by: NJoerg Roedel <joro@8bytes.org>
Acked-by: NJohan Hovold <johan@kernel.org>
Acked-by: NJohannes Thumshirn <jth@kernel.org>
Acked-by: NJonathan Corbet <corbet@lwn.net>
Acked-by: NJulia Lawall <julia.lawall@lip6.fr>
Acked-by: NKees Cook <keescook@chromium.org>
Acked-by: NKirill Tkhai <ktkhai@virtuozzo.com>
Acked-by: NKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: NLina Iyer <ilina@codeaurora.org>
Acked-by: NLinus Torvalds <torvalds@linux-foundation.org>
Acked-by: NLinus Walleij <linus.walleij@linaro.org>
Acked-by: NMark Brown <broonie@kernel.org>
Acked-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: NMasami Hiramatsu <mhiramat@kernel.org>
Acked-by: NMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: NMatias Bjørling <mb@lightnvm.io>
Acked-by: NMauro Carvalho Chehab <mchehab@kernel.org>
Acked-by: NMaxime Ripard <maxime.ripard@bootlin.com>
Acked-by: NMichael Ellerman <mpe@ellerman.id.au>
Acked-by: NMike Rapoport <rppt@linux.ibm.com>
Acked-by: NMimi Zohar <zohar@linux.ibm.com>
Acked-by: NMiquel Raynal <miquel.raynal@bootlin.com>
Acked-by: NMishi Choudhary <mishi@linux.com>
Acked-by: NNikolay Borisov <n.borisov.lkml@gmail.com>
Acked-by: NOded Gabbay <oded.gabbay@gmail.com>
Acked-by: NPalmer Dabbelt <palmer@dabbelt.com>
Acked-by: NPaul E. McKenney <paulmck@linux.ibm.com>
Acked-by: NPeter Zijlstra <peterz@infradead.org>
Acked-by: NRafael J. Wysocki <rafael@kernel.org>
Acked-by: NRichard Weinberger <richard@nod.at>
Acked-by: NRik van Riel <riel@surriel.com>
Acked-by: NRob Clark <robdclark@gmail.com>
Acked-by: NRob Herring <robh@kernel.org>
Acked-by: NRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: NSean Paul <sean@poorly.run>
Acked-by: NSebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: NSebastian Reichel <sre@kernel.org>
Acked-by: NSergio Paracuellos <sergio.paracuellos@gmail.com>
Acked-by: NShawn Guo <shawnguo@kernel.org>
Acked-by: NShuah Khan <shuah@kernel.org>
Acked-by: NSimon Horman <horms@verge.net.au>
Acked-by: NSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: NStephen Hemminger <stephen@networkplumber.org>
Acked-by: NTakashi Iwai <tiwai@kernel.org>
Acked-by: NTejun Heo <tj@kernel.org>
Acked-by: NTheodore Ts'o <tytso@mit.edu>
Acked-by: NThierry Reding <thierry.reding@gmail.com>
Acked-by: NTodd Poynor <toddpoynor@google.com>
Acked-by: NViresh Kumar <viresh.kumar@linaro.org>
Acked-by: NWei Yongjun <weiyongjun1@huawei.com>
Acked-by: NYueHaibing <yuehaibing@huawei.com>
Reviewed-by: NSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NOlof Johansson <olof@lixom.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

As it was originally worded, this paragraph requires maintainers to
enforce the code of conduct, or face potential repercussions.  It sends
the wrong message, when really we just want maintainers to be part of
the solution and not violate the code of conduct themselves.

Removing it doesn't limit our ability to enforce the code of conduct,
and we can still encourage maintainers to help maintain high standards
for the level of discourse in their subsystem.
Signed-off-by: NChris Mason <clm@fb.com>
Acked-by: NAlex Deucher <alexander.deucher@amd.com>
Acked-by: NAmir Goldstein <amir73il@gmail.com>
Acked-by: NAndrew Morton <akpm@linux-foundation.org>
Acked-by: NAnna-Maria Gleixner <anna-maria@linutronix.de>
Acked-by: NArd Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: NBoris Brezillon <boris.brezillon@bootlin.com>
Acked-by: NBorislav Petkov <bp@kernel.org>
Acked-by: NChristian Lütke-Stetzkamp <christian@lkamp.de>
Acked-by: NChristoph Hellwig <hch@lst.de>
Acked-by: NColin Ian King <colin.king@canonical.com>
Acked-by: NDan Carpenter <dan.carpenter@oracle.com>
Acked-by: NDan Williams <dan.j.williams@intel.com>
Acked-by: NDaniel Borkmann <daniel@iogearbox.net>
Acked-by: NDave Airlie <airlied@redhat.com>
Acked-by: NDave Hansen <dave.hansen@linux.intel.com>
Acked-by: NDavid Ahern <dsa@cumulusnetworks.com>
Acked-by: NDavid Sterba <kdave@kernel.org>
Acked-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: NDominik Brodowski <linux@dominikbrodowski.de>
Acked-by: NEric Dumazet <eric.dumazet@gmail.com>
Acked-by: NFelipe Balbi <balbi@kernel.org>
Acked-by: NFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: NFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: NFlorian Westphal <fw@strlen.de>
Acked-by: NGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: NGrant Likely <grant.likely@secretlab.ca>
Acked-by: NGregory CLEMENT <gregory.clement@bootlin.com>
Acked-by: NGuenter Roeck <linux@roeck-us.net>
Acked-by: NGustavo A. R. Silva <gustavo@embeddedor.com>
Acked-by: NHans Verkuil <hverkuil@xs4all.nl>
Acked-by: NHans de Goede <j.w.r.degoede@gmail.com>
Acked-by: NHarry Wentland <harry.wentland@amd.com>
Acked-by: NHeiko Stuebner <heiko@sntech.de>
Acked-by: NIngo Molnar <mingo@kernel.org>
Acked-by: NJaegeuk Kim <jaegeuk@kernel.org>
Acked-by: NJames Smart <james.smart@broadcom.com>
Acked-by: NJames Smart <jsmart2021@gmail.com>
Acked-by: NJan Kara <jack@ucw.cz>
Acked-by: NJason A. Donenfeld <Jason@zx2c4.com>
Acked-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: NJens Axboe <axboe@kernel.dk>
Acked-by: NJessica Yu <jeyu@kernel.org>
Acked-by: NJia-Ju Bai <baijiaju1990@gmail.com>
Acked-by: NJiri Kosina <jikos@kernel.org>
Acked-by: NJiri Olsa <jolsa@redhat.com>
Acked-by: NJoerg Roedel <joro@8bytes.org>
Acked-by: NJohan Hovold <johan@kernel.org>
Acked-by: NJohannes Thumshirn <jth@kernel.org>
Acked-by: NJonathan Corbet <corbet@lwn.net>
Acked-by: NJulia Lawall <julia.lawall@lip6.fr>
Acked-by: NKees Cook <keescook@chromium.org>
Acked-by: NKirill Tkhai <ktkhai@virtuozzo.com>
Acked-by: NKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: NLina Iyer <ilina@codeaurora.org>
Acked-by: NLinus Torvalds <torvalds@linux-foundation.org>
Acked-by: NLinus Walleij <linus.walleij@linaro.org>
Acked-by: NMark Brown <broonie@kernel.org>
Acked-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: NMasami Hiramatsu <mhiramat@kernel.org>
Acked-by: NMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: NMatias Bjørling <mb@lightnvm.io>
Acked-by: NMaxime Ripard <maxime.ripard@bootlin.com>
Acked-by: NMichael Ellerman <mpe@ellerman.id.au>
Acked-by: NMike Rapoport <rppt@linux.ibm.com>
Acked-by: NMimi Zohar <zohar@linux.ibm.com>
Acked-by: NMiquel Raynal <miquel.raynal@bootlin.com>
Acked-by: NNikolay Borisov <n.borisov.lkml@gmail.com>
Acked-by: NOded Gabbay <oded.gabbay@gmail.com>
Acked-by: NOlof Johansson <olof@lixom.net>
Acked-by: NPalmer Dabbelt <palmer@dabbelt.com>
Acked-by: NPaul E. McKenney <paulmck@linux.ibm.com>
Acked-by: NPeter Zijlstra <peterz@infradead.org>
Acked-by: NRafael J. Wysocki <rafael@kernel.org>
Acked-by: NRichard Weinberger <richard@nod.at>
Acked-by: NRik van Riel <riel@surriel.com>
Acked-by: NRob Clark <robdclark@gmail.com>
Acked-by: NRob Herring <robh@kernel.org>
Acked-by: NRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: NSebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: NSebastian Reichel <sre@kernel.org>
Acked-by: NSergio Paracuellos <sergio.paracuellos@gmail.com>
Acked-by: NShawn Guo <shawnguo@kernel.org>
Acked-by: NShuah Khan <shuah@kernel.org>
Acked-by: NSimon Horman <horms@verge.net.au>
Acked-by: NSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: NStephen Hemminger <stephen@networkplumber.org>
Acked-by: NTakashi Iwai <tiwai@kernel.org>
Acked-by: NTejun Heo <tj@kernel.org>
Acked-by: NTheodore Ts'o <tytso@mit.edu>
Acked-by: NThierry Reding <thierry.reding@gmail.com>
Acked-by: NThomas Gleixner <tglx@linutronix.de>
Acked-by: NTim Bird <tim.bird@sony.com>
Acked-by: NTodd Poynor <toddpoynor@google.com>
Acked-by: NTrond Myklebust <trond.myklebust@hammerspace.com>
Acked-by: NViresh Kumar <viresh.kumar@linaro.org>
Acked-by: NWei Yongjun <weiyongjun1@huawei.com>
Acked-by: NYueHaibing <yuehaibing@huawei.com>
Reviewed-by: NMauro Carvalho Chehab <mchehab@kernel.org>
Reviewed-by: NSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Wolfram writes:
  "i2c for 4.19

   Another driver bugfix and MAINTAINERS addition from I2C."

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: rcar: cleanup DMA for all kinds of failure
  MAINTAINERS: Add entry for Broadcom STB I2C controller

David writes:
  "Networking:

   A few straggler bug fixes:

   1) Fix indexing of multi-pass dumps of ipv6 addresses, from David
      Ahern.

   2) Revert RCU locking change for bonding netpoll, causes worse
      problems than it solves.

   3) pskb_trim_rcsum_slow() doesn't handle odd trim offsets, resulting
      in erroneous bad hw checksum triggers with CHECKSUM_COMPLETE
      devices.  From Dimitris Michailidis.

   4) a revert to some neighbour code changes that adjust notifications
      in a way that confuses some apps."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  Revert "neighbour: force neigh_invalidate when NUD_FAILED update is from admin"
  net/ipv6: Fix index counter for unicast addresses in in6_dump_addrs
  net: fix pskb_trim_rcsum_slow() with odd trim offset
  Revert "bond: take rcu lock in netpoll_send_skb_on_dev"

This reverts commit 8e326289.

This patch results in unnecessary netlink notification when one
tries to delete a neigh entry already in NUD_FAILED state. Found
this with a buggy app that tries to delete a NUD_FAILED entry
repeatedly. While the notification issue can be fixed with more
checks, adding more complexity here seems unnecessary. Also,
recent tests with other changes in the neighbour code have
shown that the INCOMPLETE and PROBE checks are good enough for
the original issue.
Signed-off-by: NRoopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

The loop wants to skip previously dumped addresses, so loops until
current index >= saved index. If the message fills it wants to save
the index for the next address to dump - ie., the one that did not
fit in the current message.

Currently, it is incrementing the index counter before comparing to the
saved index, and then the saved index is off by 1 - it assumes the
current address is going to fit in the message.

Change the index handling to increment only after a succesful dump.

Fixes: 502a2ffd ("ipv6: convert idev_list to list macros")
Signed-off-by: NDavid Ahern <dsahern@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

DMA needs to be cleaned up not only on timeout, but on all errors where
it has been setup before.

Fixes: 73e8b052 ("i2c: rcar: add DMA support")
Signed-off-by: NWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: NWolfram Sang <wsa@the-dreams.de>

Add an entry for the Broadcom STB I2C controller in the MAINTAINERS file.
Signed-off-by: NKamal Dasu <kdasu.kdev@gmail.com>
Acked-by: NFlorian Fainelli <f.fainelli@gmail.com>
[wsa: fixed sorting and a whitespace error]
Signed-off-by: NWolfram Sang <wsa@the-dreams.de>

Ingo writes:
  "x86 fixes:

   It's 4 misc fixes, 3 build warning fixes and 3 comment fixes.

   In hindsight I'd have left out the 3 comment fixes to make the pull
   request look less scary at such a late point in the cycle. :-/"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/swiotlb: Enable swiotlb for > 4GiG RAM on 32-bit kernels
  x86/fpu: Fix i486 + no387 boot crash by only saving FPU registers on context switch if there is an FPU
  x86/fpu: Remove second definition of fpu in __fpu__restore_sig()
  x86/entry/64: Further improve paranoid_entry comments
  x86/entry/32: Clear the CS high bits
  x86/boot: Add -Wno-pointer-sign to KBUILD_CFLAGS
  x86/time: Correct the attribute on jiffies' definition
  x86/entry: Add some paranoid entry/exit CR3 handling comments
  x86/percpu: Fix this_cpu_read()
  x86/tsc: Force inlining of cyc2ns bits

Ingo writes:
  "scheduler fixes:

   Two fixes: a CFS-throttling bug fix, and an interactivity fix."

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Fix the min_vruntime update logic in dequeue_entity()
  sched/fair: Fix throttle_list starvation with low CFS quota

Ingo writes:
  "perf fixes:

   Misc perf tooling fixes."

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf tools: Stop fallbacking to kallsyms for vdso symbols lookup
  perf tools: Pass build flags to traceevent build
  perf report: Don't crash on invalid inline debug information
  perf cpu_map: Align cpu map synthesized events properly.
  perf tools: Fix tracing_path_mount proper path
  perf tools: Fix use of alternatives to find JDIR
  perf evsel: Store ids for events with their own cpus perf_event__synthesize_event_update_cpus
  perf vendor events intel: Fix wrong filter_band* values for uncore events
  Revert "perf tools: Fix PMU term format max value calculation"
  tools headers uapi: Sync kvm.h copy
  tools arch uapi: Sync the x86 kvm.h copy

We've been getting checksum errors involving small UDP packets, usually
59B packets with 1 extra non-zero padding byte. netdev_rx_csum_fault()
has been complaining that HW is providing bad checksums. Turns out the
problem is in pskb_trim_rcsum_slow(), introduced in commit 88078d98
("net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends").

The source of the problem is that when the bytes we are trimming start
at an odd address, as in the case of the 1 padding byte above,
skb_checksum() returns a byte-swapped value. We cannot just combine this
with skb->csum using csum_sub(). We need to use csum_block_sub() here
that takes into account the parity of the start address and handles the
swapping.

Matches existing code in __skb_postpull_rcsum() and esp_remove_trailer().

Fixes: 88078d98 ("net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends")
Signed-off-by: NDimitris Michailidis <dmichail@google.com>
Reviewed-by: NEric Dumazet <edumazet@google.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

Dave writes:
  "drm fixes for 4.19 final (part 2)

   Looked like two stragglers snuck in, one very urgent the pageflipping
   was missing a reference that could result in a GPF on non-i915
   drivers, the other is an overflow in the sun4i dotclock calcs
   resulting in a mode not getting set."

* tag 'drm-fixes-2018-10-20-1' of git://anongit.freedesktop.org/drm/drm:
  drm/sun4i: Fix an ulong overflow in the dotclock driver
  drm: Get ref on CRTC commit object when waiting for flip_done

Steven writes:
  "tracing: A few small fixes to synthetic events

   Masami found some issues with the creation of synthetic events.  The
   first two patches fix handling of unsigned type, and handling of a
   space before an ending semi-colon.

   The third patch adds a selftest to test the processing of synthetic
   events."

* tag 'trace-v4.19-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  selftests: ftrace: Add synthetic event syntax testcase
  tracing: Fix synthetic event to allow semicolon at end
  tracing: Fix synthetic event to accept unsigned modifier

Dmitry writes:
  "Input updates for 4.19-rc8

   Just an addition to elan touchpad driver ACPI table."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elan_i2c - add ACPI ID for Lenovo IdeaPad 330-15IGM