[linux-merge]linux integration; annotated tag, v4.15-rc1, created. v4.15-rc1
by postmaster＠open-mesh.org
The annotated tag, v4.15-rc1 has been created
at 2fd4bf77c3d8ccceaf6bdaa507ee4cf94e1a2ca5 (tag)
tagging 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (commit)
replaces v4.14
tagged by Linus Torvalds
on Sun Nov 26 16:01:57 2017 -0800
- Shortlog ------------------------------------------------------------
Linux 4.15-rc1
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJaG1X1AAoJEHm+PkMAQRiGLcMH/iZ0K7obuuqVZCs1j0EeBTHB
WTy+uhIND+7Zrdz+UXM9xcisyzSHKbrIqOzXygXNqoYPGqqQF+o2grw8xoSftxPG
/Pashmda3gF+GTxpNJ5ZXjNoGlWJ/egiZZKTilJ1oBHAgSpTvK/e9KGY0zgimOEy
KAQUYzydtxKrXl72/ybX64FiJNmTu13PFD5uWvMsxfQstbyLhPU8B2XgoNSSe2TA
lxYPIt5P3X+5EjfdrhmEYqANjqyHp2cWBOGkocqyfYbXlJKfhmNu/Ar61yz21LXd
M+vk7vkEZ7QWaHjtPS4M3noBqu3PIy6JPxYgZ+huBIxlK0BF5RSwSTfVMfrV4y0=
=cZ6Z
-----END PGP SIGNATURE-----
David Ahern (2):
net: Add extack to ndo_add_slave
net: Add extack to upper device linking
David S. Miller (1):
Merge tag 'batadv-next-for-davem-20171006' of git://git.open-mesh.org/linux-merge
Gao Feng (1):
net: Remove useless function skb_header_release
Kees Cook (1):
treewide: setup_timer() -> timer_setup()
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (5):
batman-adv: Remove unnecessary parentheses
batman-adv: Fix "line over 80 characters" checkpatch warning
batman-adv: Add argument names for function ptr definitions
batman-adv: Add missing kerneldoc for extack
batman-adv: Avoid spurious warnings from bat_v neigh_cmp implementation
-----------------------------------------------------------------------
--
linux integration
3 years, 9 months
[linux-merge]linux integration; annotated tag, v4.14, created. v4.14
by postmaster＠open-mesh.org
The annotated tag, v4.14 has been created
at e3d97e8db5c45dfe3e4c70252acc5f4edea172b7 (tag)
tagging bebc6082da0a9f5d47a1ea2edc099bf671058bd4 (commit)
replaces v4.14-rc8
tagged by Linus Torvalds
on Sun Nov 12 10:46:21 2017 -0800
- Shortlog ------------------------------------------------------------
Linux 4.14
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJaCJb+AAoJEHm+PkMAQRiGGZEIAJvmVi/nMB3KLPryyNBAlvWC
tBy7jxgl3LEUqT1QgRTKsfQtURfiH9BEmN8oM+WG2TkbAS9zMFoVVKUPpzZyb00J
qSk/voSUiH46kCQfQlbM4Del4iHjngiJRDUQguRnaXzK1+LsAvIMNOLiA/z+auKB
XZLRmt4t2PB1xkUmjumI16MYfkPRs0Y85bIWE5fATK02ci3daY1VtSvEHhvz5sHO
69TzUdk8EWrdnuWxJ+zQ+1EzYVHMh/h1mNNlywRbpGvq8GumBRpZGnb7KyHTkh3y
Q4HLB8yaFxEwTTOWm5+bczY91KbWVZ6e4DKHSz4ka1fwFg0MFKLRvhRvakJy1jE=
=aB7O
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
3 years, 10 months
[alfred] ecsv/master, master: alfred: Keep length unsigned when processing packets (d4cd6f3)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/alfred
On branches: ecsv/master,master
>---------------------------------------------------------------
commit d4cd6f3ec244ff257c21d40eb5312adce5206989
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Tue Oct 24 10:05:52 2017 +0200
alfred: Keep length unsigned when processing packets
The header.length field is unsigned (network byte order). The converted
datatype should therefore also be unsigned.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
d4cd6f3ec244ff257c21d40eb5312adce5206989
recv.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/recv.c b/recv.c
index 83fbff9..ebc3041 100644
--- a/recv.c
+++ b/recv.c
@@ -41,22 +41,26 @@ static int finish_alfred_push_data(struct globals *globals,
struct ether_addr mac,
struct alfred_push_data_v0 *push)
{
- int len, data_len;
+ unsigned int len, data_len;
bool new_entry_created;
struct alfred_data *data;
struct dataset *dataset;
uint8_t *pos;
+ /* test already done in process_alfred_push_data */
len = ntohs(push->header.length);
+ if (len < sizeof(*push) - sizeof(push->header))
+ return -1;
+
len -= sizeof(*push) - sizeof(push->header);
pos = (uint8_t *)push->data;
- while (len >= (int)sizeof(*data)) {
+ while (len >= sizeof(*data)) {
data = (struct alfred_data *)pos;
data_len = ntohs(data->header.length);
/* check if enough data is available */
- if ((int)(data_len + sizeof(*data)) > len)
+ if (data_len + sizeof(*data) > len)
break;
new_entry_created = false;
@@ -194,7 +198,7 @@ static int process_alfred_push_data(struct globals *globals,
alfred_addr *source,
struct alfred_push_data_v0 *push)
{
- int len;
+ unsigned int len;
struct ether_addr mac;
int ret;
struct transaction_head search, *head;
@@ -209,7 +213,7 @@ static int process_alfred_push_data(struct globals *globals,
goto err;
len = ntohs(push->header.length);
- if (len < (int)(sizeof(*push) - sizeof(push->header)))
+ if (len < sizeof(*push) - sizeof(push->header))
goto err;
search.server_addr = mac;
@@ -310,7 +314,7 @@ static int process_alfred_request(struct globals *globals,
alfred_addr *source,
struct alfred_request_v0 *request)
{
- int len;
+ unsigned int len;
len = ntohs(request->header.length);
@@ -333,7 +337,8 @@ static int process_alfred_status_txend(struct globals *globals,
{
struct transaction_head search, *head;
struct ether_addr mac;
- int len, ret;
+ unsigned int len;
+ int ret;
len = ntohs(request->header.length);
3 years, 10 months
[alfred] ecsv/master, master: alfred: Remove announce length validation (0c8f710)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/alfred
On branches: ecsv/master,master
>---------------------------------------------------------------
commit 0c8f7107ce339e34131eee57041e94d6ef985b64
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Tue Oct 24 10:04:07 2017 +0200
alfred: Remove announce length validation
The announce message has no extra fields. The check whether the
header.length field is >= 0 will therefore always be true because
header.length is an unsigned short.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
0c8f7107ce339e34131eee57041e94d6ef985b64
alfred.h | 2 ++
recv.c | 7 ++-----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/alfred.h b/alfred.h
index 460f52f..f52e66b 100644
--- a/alfred.h
+++ b/alfred.h
@@ -147,6 +147,8 @@ struct globals {
#define debugMalloc(size, num) malloc(size)
#define debugFree(ptr, num) free(ptr)
+#define BUILD_BUG_ON(e) ((void)sizeof(char[1 - 2 * !!(e)]))
+
#define MAX_PAYLOAD ((1 << 16) - 1 - sizeof(struct udphdr))
extern alfred_addr alfred_mcast;
diff --git a/recv.c b/recv.c
index e897e3d..83fbff9 100644
--- a/recv.c
+++ b/recv.c
@@ -270,9 +270,6 @@ process_alfred_announce_master(struct globals *globals,
struct server *server;
struct ether_addr mac;
int ret;
- int len;
-
- len = ntohs(announce->header.length);
if (globals->ipv4mode)
ret = ipv4_to_mac(interface, source, &mac);
@@ -284,8 +281,8 @@ process_alfred_announce_master(struct globals *globals,
if (announce->header.version != ALFRED_VERSION)
return -1;
- if (len < (sizeof(*announce) - sizeof(announce->header)))
- return -1;
+ /* skip header.length check because "announce" has no extra fields */
+ BUILD_BUG_ON(sizeof(*announce) - sizeof(announce->header) != 0);
server = hash_find(interface->server_hash, &mac);
if (!server) {
3 years, 10 months
[linux-merge]linux integration; annotated tag, v4.14-rc8, created. v4.14-rc8
by postmaster＠open-mesh.org
The annotated tag, v4.14-rc8 has been created
at b60ed69f0d467074fba635278de2df54daf43d3b (tag)
tagging 39dae59d66acd86d1de24294bd2f343fd5e7a625 (commit)
replaces v4.14-rc7
tagged by Linus Torvalds
on Sun Nov 5 13:05:26 2017 -0800
- Shortlog ------------------------------------------------------------
Linux 4.14-rc8
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJZ/30WAAoJEHm+PkMAQRiG1YkIAIVgcZS9SPzjcH+/NpcNJ4wv
Bp8xyfj/X6Eswn63ebrV/qij65Esmha7wnSREcFqrfNecRwOAdvYCjj20jqKGws2
p03sOS4aVSpJSQcqJ9sdF3Xx/P7CcK4IAjr0ihQbqozXiZAgVzTlYJwB+ErBMWFU
6NFYXg/Xp7FJXJ0o14yHpZ4RqgbLV95CgFIG9hzwvCibsW6ZBvGtYBD99IjeojPg
rw+B+Osck7XjC6IHqF/u760nTOaP8vVlTrCRqvFityGS9ZFQZDzEKYqxYgk8cVFC
jzR3fuHiWiomhyP9dLUZn6UuYQTaThhY58LvsEwV0JVJH9mUwcA4u5nO0wDUCO4=
=hhQa
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
3 years, 10 months