lkml.org 
[lkml]   [2017]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 111/147] pkt_sched: Fix warning false positives.
    3.2.95-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "David S. Miller" <davem@davemloft.net>

    commit f54ba7798848ce1385a71b36a2c997422c82220a upstream.

    GCC refuses to recognize that all error control flows do in fact
    set err to something.

    Add an explicit initialization to shut it up.

    net/sched/sch_drr.c: In function ‘drr_enqueue’:
    net/sched/sch_drr.c:359:11: warning: ‘err’ may be used uninitialized in this function [-Wmaybe-uninitialized]
    net/sched/sch_qfq.c: In function ‘qfq_enqueue’:
    net/sched/sch_qfq.c:885:11: warning: ‘err’ may be used uninitialized in this function [-Wmaybe-uninitialized]

    Signed-off-by: David S. Miller <davem@davemloft.net>
    [bwh: Backported to 3.2: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/sched/sch_drr.c | 2 +-
    net/sched/sch_qfq.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- a/net/sched/sch_drr.c
    +++ b/net/sched/sch_drr.c
    @@ -351,7 +351,7 @@ static int drr_enqueue(struct sk_buff *s
    {
    struct drr_sched *q = qdisc_priv(sch);
    struct drr_class *cl;
    - int err;
    + int err = 0;

    cl = drr_classify(skb, sch, &err);
    if (cl == NULL) {
    --- a/net/sched/sch_qfq.c
    +++ b/net/sched/sch_qfq.c
    @@ -846,7 +846,7 @@ static int qfq_enqueue(struct sk_buff *s
    struct qfq_sched *q = qdisc_priv(sch);
    struct qfq_group *grp;
    struct qfq_class *cl;
    - int err;
    + int err = 0;
    u64 roundedS;
    int s;

    \
     
     \ /
      Last update: 2017-11-08 20:58    [W:4.093 / U:0.444 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site