linux-merge

linux-merge@lists.open-mesh.org

2 participants
7455 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20120621
by batman＠open-mesh.org 21 Jun '12

21 Jun '12

The following commit has been merged in the master branch: commit 66a1b2bcb34b0c74a3422968b15a7ea853ea5a2d Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sat Apr 14 13:15:26 2012 +0200 batman-adv: convert bat_priv->tt_crc from atomic_t to uint16_t In the code we neever need to atomically check and set the bat_priv->tt_crc field value. It is simply set and read once in different pieces of the code. Therefore this field can be safely be converted from atomic_t to uint16_t. Reported-by: Al Viro <viro(a)ZenIV.linux.org.uk> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index dc53798..ec35119 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -575,8 +575,7 @@ static void bat_iv_ogm_schedule(struct hard_iface *hard_iface, htonl((uint32_t)atomic_read(&hard_iface->seqno)); batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn); - batman_ogm_packet->tt_crc = htons((uint16_t) - atomic_read(&bat_priv->tt_crc)); + batman_ogm_packet->tt_crc = htons(bat_priv->tt_crc); if (tt_num_changes >= 0) batman_ogm_packet->tt_num_changes = tt_num_changes; diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index f47299f..f5ff364 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -111,7 +111,7 @@ static int prepare_packet_buffer(struct bat_priv *bat_priv, realloc_packet_buffer(hard_iface, new_len); - atomic_set(&bat_priv->tt_crc, tt_local_crc(bat_priv)); + bat_priv->tt_crc = tt_local_crc(bat_priv); /* reset the sending counter */ atomic_set(&bat_priv->tt_ogm_append_cnt, TT_OGM_APPEND_MAX); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 61308e8..547dc33 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -210,7 +210,7 @@ struct bat_priv { spinlock_t vis_list_lock; /* protects vis_info::recv_list */ atomic_t num_local_tt; /* Checksum of the local table, recomputed before sending a new OGM */ - atomic_t tt_crc; + uint16_t tt_crc; unsigned char *tt_buff; int16_t tt_buff_len; spinlock_t tt_buff_lock; /* protects tt_buff */ -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120621
by batman＠open-mesh.org 21 Jun '12

21 Jun '12

The following commit has been merged in the master branch: commit 5d52dad27a08d2c8851acb12b041088ec07881dd Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 29 12:38:20 2012 +0200 batman-adv: Initialize lockdep class keys for hashes The hash for claim and backbone hash in the bridge loop avoidance code receive the same key because they are getting initialized by hash_new with the same key. Lockdep will create a backtrace when they are used recursively. This can be avoided by reinitializing the key directly after the hash_new. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 8bf9751..5c1ac55 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1127,6 +1127,14 @@ out: bla_start_timer(bat_priv); } +/* The hash for claim and backbone hash receive the same key because they + * are getting initialized by hash_new with the same key. Reinitializing + * them with to different keys to allow nested locking without generating + * lockdep warnings + */ +static struct lock_class_key claim_hash_lock_class_key; +static struct lock_class_key backbone_hash_lock_class_key; + /* initialize all bla structures */ int bla_init(struct bat_priv *bat_priv) { @@ -1164,6 +1172,11 @@ int bla_init(struct bat_priv *bat_priv) if (!bat_priv->claim_hash || !bat_priv->backbone_hash) return -1; + batadv_hash_set_lock_class(bat_priv->claim_hash, + &claim_hash_lock_class_key); + batadv_hash_set_lock_class(bat_priv->backbone_hash, + &backbone_hash_lock_class_key); + bat_dbg(DBG_BLA, bat_priv, "bla hashes initialized\n"); bla_start_timer(bat_priv); diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c index 117687b..5b2eabe 100644 --- a/net/batman-adv/hash.c +++ b/net/batman-adv/hash.c @@ -69,3 +69,12 @@ free_hash: kfree(hash); return NULL; } + +void batadv_hash_set_lock_class(struct hashtable_t *hash, + struct lock_class_key *key) +{ + uint32_t i; + + for (i = 0; i < hash->size; i++) + lockdep_set_class(&hash->list_locks[i], key); +} diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h index d4bd786..93b3c71 100644 --- a/net/batman-adv/hash.h +++ b/net/batman-adv/hash.h @@ -45,6 +45,10 @@ struct hashtable_t { /* allocates and clears the hash */ struct hashtable_t *hash_new(uint32_t size); +/* set class key for all locks */ +void batadv_hash_set_lock_class(struct hashtable_t *hash, + struct lock_class_key *key); + /* free only the hashtable and the hash itself. */ void hash_destroy(struct hashtable_t *hash); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120621
by batman＠open-mesh.org 21 Jun '12

21 Jun '12

The following commit has been merged in the master branch: commit d2b6cc8e460494251442a877fcbc150faa175b4f Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Jun 14 22:21:28 2012 +0200 batman-adv: fix skb->data assignment skb_linearize(skb) possibly rearranges the skb internal data and then changes the skb->data pointer value. For this reason any other pointer in the code that was assigned skb->data before invoking skb_linearise(skb) must be re-assigned. In the current tt_query message handling code this is not done and therefore, in case of skb linearization, the pointer used to handle the packet header ends up in pointing to poisoned memory. The packet is then dropped but the translation-table mechanism is corrupted. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Cc: <stable(a)vger.kernel.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 840e2c6..015471d 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -617,6 +617,8 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) * changes */ if (skb_linearize(skb) < 0) goto out; + /* skb_linearize() possibly changed skb->data */ + tt_query = (struct tt_query_packet *)skb->data; tt_len = tt_query->tt_data * sizeof(struct tt_change); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120621
by batman＠open-mesh.org 21 Jun '12

21 Jun '12

The following commit has been merged in the master branch: commit 284fefd59ae0357695b17b59cb44d7cc12445bb5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jun 17 13:26:37 2012 +0200 batman-adv: update internal version number Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index f4a3ec0..630bbe8 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -28,7 +28,7 @@ #define DRIVER_DEVICE "batman-adv" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2012.2.0" +#define SOURCE_VERSION "2012.3.0" #endif /* B.A.T.M.A.N. parameters */ -- LinuxNextTracking

1 0

Build check errors found: 2012-06-21
by postmaster＠open-mesh.org 20 Jun '12

20 Jun '12

Name of failed tests ==================== bracket_align master bat_iv_ogm.c bracket_align master compat.h bracket_align master debugfs.c bracket_align master gateway_client.c bracket_align master hard-interface.c bracket_align master originator.c bracket_align master routing.c bracket_align master sysfs.c bracket_align master unicast.c bracket_align next bat_iv_ogm.c bracket_align next compat.h bracket_align next debugfs.c bracket_align next gateway_client.c bracket_align next hard-interface.c bracket_align next originator.c bracket_align next routing.c bracket_align next sysfs.c bracket_align next unicast.c checkpatch master bridge_loop_avoidance.c checkpatch master hash.c checkpatch next bridge_loop_avoidance.c checkpatch next hash.c Output of different failed tests ================================ bracket_align next bat_iv_ogm.c: >>>>>>>> Found wrong alignment at bat_iv_ogm.c:148, was 35 but expected 38 bracket_align next compat.h: >>>>>>>> Found wrong alignment at compat.h:75, was 9 but expected 14 Found wrong alignment at compat.h:76, was 9 but expected 14 bracket_align next debugfs.c: >>>>>>>> Found wrong alignment at debugfs.c:137, was 33 but expected 42 Found wrong alignment at debugfs.c:373, was 43 but expected 44 Found wrong alignment at debugfs.c:374, was 43 but expected 44 Found wrong alignment at debugfs.c:375, was 43 but expected 44 bracket_align next gateway_client.c: >>>>>>>> Found wrong alignment at gateway_client.c:231, was 29 but expected 28 Found wrong alignment at gateway_client.c:232, was 29 but expected 28 bracket_align next hard-interface.c: >>>>>>>> Found wrong alignment at hard-interface.c:328, was 17 but expected 13 Found wrong alignment at hard-interface.c:335, was 17 but expected 13 Found wrong alignment at hard-interface.c:489, was 26 but expected 33 bracket_align next originator.c: >>>>>>>> Found wrong alignment at originator.c:455, was 49 but expected 59 Found wrong alignment at originator.c:457, was 49 but expected 60 bracket_align next routing.c: >>>>>>>> Found wrong alignment at routing.c:973, was 25 but expected 44 bracket_align next sysfs.c: >>>>>>>> Found wrong alignment at sysfs.c:122, was 25 but expected 28 bracket_align next unicast.c: >>>>>>>> Found wrong alignment at unicast.c:349, was 33 but expected 13 checkpatch next bridge_loop_avoidance.c: >>>>>>>> CHECK: space prohibited before semicolon #1225: FILE: bridge_loop_avoidance.c:1225: + for (i = 0 ; i < BATADV_DUPLIST_SIZE; i++) { total: 0 errors, 0 warnings, 1 checks, 1594 lines checked NOTE: Ignored message types: COMPLEX_MACRO bridge_loop_avoidance.c has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. checkpatch next hash.c: >>>>>>>> CHECK: space prohibited before semicolon #28: FILE: hash.c:28: + for (i = 0 ; i < hash->size; i++) { CHECK: space prohibited before semicolon #76: FILE: hash.c:76: + for (i = 0 ; i < hash->size; i++) total: 0 errors, 0 warnings, 2 checks, 78 lines checked NOTE: Ignored message types: COMPLEX_MACRO hash.c has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120620
by batman＠open-mesh.org 20 Jun '12

20 Jun '12

The following commit has been merged in the master branch: commit 2c995ff892313009e336ecc8ec3411022f5b1c39 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Jun 19 09:26:39 2012 +0000 batman-adv: fix skb->data assignment skb_linearize(skb) possibly rearranges the skb internal data and then changes the skb->data pointer value. For this reason any other pointer in the code that was assigned skb->data before invoking skb_linearise(skb) must be re-assigned. In the current tt_query message handling code this is not done and therefore, in case of skb linearization, the pointer used to handle the packet header ends up in pointing to free'd memory. This bug was introduced by a73105b8d4c765d9ebfb664d0a66802127d8e4c7 (batman-adv: improved client announcement mechanism) Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Cc: <stable(a)vger.kernel.org> Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 840e2c6..015471d 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -617,6 +617,8 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) * changes */ if (skb_linearize(skb) < 0) goto out; + /* skb_linearize() possibly changed skb->data */ + tt_query = (struct tt_query_packet *)skb->data; tt_len = tt_query->tt_data * sizeof(struct tt_change); -- LinuxNextTracking

1 0

Build check errors found: 2012-06-20
by postmaster＠open-mesh.org 19 Jun '12

19 Jun '12

1 0

Build check errors found: 2012-06-19
by postmaster＠open-mesh.org 18 Jun '12

18 Jun '12

Name of failed tests ==================== checkpatch master bridge_loop_avoidance.c checkpatch master hash.c checkpatch next bridge_loop_avoidance.c checkpatch next hash.c Output of different failed tests ================================ checkpatch next bridge_loop_avoidance.c: >>>>>>>> CHECK: space prohibited before semicolon #1225: FILE: bridge_loop_avoidance.c:1225: + for (i = 0 ; i < BATADV_DUPLIST_SIZE; i++) { total: 0 errors, 0 warnings, 1 checks, 1594 lines checked NOTE: Ignored message types: COMPLEX_MACRO bridge_loop_avoidance.c has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. checkpatch next hash.c: >>>>>>>> CHECK: space prohibited before semicolon #28: FILE: hash.c:28: + for (i = 0 ; i < hash->size; i++) { CHECK: space prohibited before semicolon #76: FILE: hash.c:76: + for (i = 0 ; i < hash->size; i++) total: 0 errors, 0 warnings, 2 checks, 78 lines checked NOTE: Ignored message types: COMPLEX_MACRO hash.c has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.

1 0

Build check errors found: 2012-06-18
by postmaster＠open-mesh.org 17 Jun '12

17 Jun '12

1 0

Build check errors found: 2012-06-12
by postmaster＠open-mesh.org 11 Jun '12

11 Jun '12

Name of failed tests ==================== cppcheck master sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n Output of different failed tests ================================ cppcheck master: >>>>>>>> (information) Cppcheck cannot find all the include files (use --check-config for details) sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> /home/batman/build_test/tmp/main.h:260:49: warning: dereference of noderef expression /home/batman/build_test/tmp/main.h:260:49: warning: dereference of noderef expression /home/batman/build_test/tmp/main.h:260:49: warning: dereference of noderef expression /home/batman/build_test/tmp/main.h:260:49: warning: dereference of noderef expression /home/batman/build_test/tmp/main.h:260:49: warning: dereference of noderef expression /home/batman/build_test/tmp/main.h:260:49: warning: dereference of noderef expression /home/batman/build_test/tmp/main.h:260:49: warning: dereference of noderef expression /home/batman/build_test/tmp/main.h:260:49: warning: dereference of noderef expression /home/batman/build_test/tmp/main.h:260:49: warning: dereference of noderef expression /home/batman/build_test/tmp/main.h:275:26: warning: incorrect type in assignment (different address spaces) /home/batman/build_test/tmp/main.h:275:26: expected unsigned long long [usertype] *counters /home/batman/build_test/tmp/main.h:275:26: got unsigned long long [noderef] [usertype] <asn:3>*bat_counters /home/batman/build_test/tmp/main.h:260:49: warning: dereference of noderef expression /home/batman/build_test/tmp/main.h:260:49: warning: dereference of noderef expression /home/batman/build_test/tmp/main.h:260:49: warning: dereference of noderef expression /home/batman/build_test/tmp/main.h:260:49: warning: dereference of noderef expression sparse next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> include/net/inet_sock.h:208:17: warning: do-while statement is not a compound statement

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge