Phonet: do not reply to indication reset packets

This fixes a potential error packet loop.

Signed-off-by: Remi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index c9609f9aedac6666ec0525f6c4b8d2fbd74a6fbb..4157faa857b697b3c9a4a5e55520ef7dd6c48339 100644 (file)
--- a/include/linux/phonet.h
+++ b/include/linux/phonet.h
@@ -72,6 +72,7 @@ struct phonetmsg {
        } pn_msg_u;
 };
 #define PN_COMMON_MESSAGE      0xF0
+#define PN_COMMGR              0x10
 #define PN_PREFIX              0xE0 /* resource for extended messages */
 #define pn_submsg_id           pn_msg_u.base.pn_submsg_id
 #define pn_e_submsg_id         pn_msg_u.ext.pn_e_submsg_id

diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
index b9d97effebe32ac3c276bf4dee94cda5da4fb7cf..defeb7a0d502ab92dcc7253f0f97e10ae341209e 100644 (file)
--- a/net/phonet/af_phonet.c
+++ b/net/phonet/af_phonet.c
@@ -261,6 +261,8 @@ static inline int can_respond(struct sk_buff *skb)
                return 0; /* we are not the destination */
        if (ph->pn_res == PN_PREFIX && !pskb_may_pull(skb, 5))
                return 0;
+       if (ph->pn_res == PN_COMMGR) /* indications */
+               return 0;
 
        ph = pn_hdr(skb); /* re-acquires the pointer */
        pm = pn_msg(skb);
@@ -309,7 +311,8 @@ static int send_reset_indications(struct sk_buff *rskb)
 
        return pn_raw_send(data, sizeof(data), rskb->dev,
                                pn_object(oph->pn_sdev, 0x00),
-                               pn_object(oph->pn_rdev, oph->pn_robj), 0x10);
+                               pn_object(oph->pn_rdev, oph->pn_robj),
+                               PN_COMMGR);
 }