From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx49e7Am0XD0u2M291n/NnpfCQNGcedMow9Q8V1apbZw3JOiA/2LDv7NUp2caqs1C2nFCCKHH ARC-Seal: i=1; a=rsa-sha256; t=1523472228; cv=none; d=google.com; s=arc-20160816; b=DSAg6taUB2erofs3ToeHuoWVz4RpU9i8+hn5voEpWPUSX2YO/wjKAoy0affHXFT6Ab gvSXxbYTC76FKgmz2KLkj9KbM9qy2LjwDN3GgsozH/8N+K43JYz1eUOmHSg/DNnPJ/6r eqkKKrrw8V1edgkEiNINHecplfEFlUr528GEfk04t1rqAqDl7JHlH/AdgSYXfU9eH4to RbWGLaD0BlH24y4YKFyfHgfz+HevmbRhkzCBfVh1C/Uu5+IaJNVm6cv0sdWOf9RnueI2 smw1l+LAKZbL/D0Y29Lb9xrJTI2z340HQ9Nk9pqASf8fKGAPRKp/lMfEcUCVdCIa/8js dDIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=NpEHznZhDkAkZc8GVE7veKYzE19EFVpMdJksx0dMdZA=; b=XhRU06GWHQnFh02Y0bqkhPix/E+ZqjFy4uLYOJuwr9g4UyUhoUELnq81ETl6VTGonz lS1f7FSEgtdVCDD08qQKd5RGEYg5UpD3KacNAzQhH58n8EUXnl6ugdU2uF5MXxnPOXaH jQV8RzVjYNjgHpjIPWkTjOxZgE19PFOFcAcb3Gwv7vRs6TfM5HFib6WNcpbRuLq/+/1l Z10wuO09Gr1NL2e0JUIocu9nyxYDaf+eOw02z7SajgWhZ1WJpv0qKiCeiSu5RJU45hwE O0fROPAqu3oi8Wqf+ZM2jgpeOegZJXI3iTiWx8E5Rc1GhR9qdGh0REJ+X+xmujIHPKRg vSHA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jim Baxter , =?UTF-8?q?Bj=C3=B8rn=20Mork?= , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 012/190] net: cdc_ncm: Fix TX zero padding Date: Wed, 11 Apr 2018 20:34:18 +0200 Message-Id: <20180411183550.746315682@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183550.114495991@linuxfoundation.org> References: <20180411183550.114495991@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1597476415462028016?= X-GMAIL-MSGID: =?utf-8?q?1597476415462028016?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jim Baxter [ Upstream commit aeca3a77b1e0ed06a095933b89c86aed007383eb ] The zero padding that is added to NTB's does not zero the memory correctly. This is because the skb_put modifies the value of skb_out->len which results in the memset command not setting any memory to zero as (ctx->tx_max - skb_out->len) == 0. I have resolved this by storing the size of the memory to be zeroed before the skb_put and using this in the memset call. Signed-off-by: Jim Baxter Reviewed-by: Bjørn Mork Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/cdc_ncm.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -1069,6 +1069,7 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev u16 n = 0, index, ndplen; u8 ready2send = 0; u32 delayed_ndp_size; + size_t padding_count; /* When our NDP gets written in cdc_ncm_ndp(), then skb_out->len gets updated * accordingly. Otherwise, we should check here. @@ -1225,11 +1226,13 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev * a ZLP after full sized NTBs. */ if (!(dev->driver_info->flags & FLAG_SEND_ZLP) && - skb_out->len > ctx->min_tx_pkt) - memset(skb_put(skb_out, ctx->tx_max - skb_out->len), 0, - ctx->tx_max - skb_out->len); - else if (skb_out->len < ctx->tx_max && (skb_out->len % dev->maxpacket) == 0) + skb_out->len > ctx->min_tx_pkt) { + padding_count = ctx->tx_max - skb_out->len; + memset(skb_put(skb_out, padding_count), 0, padding_count); + } else if (skb_out->len < ctx->tx_max && + (skb_out->len % dev->maxpacket) == 0) { *skb_put(skb_out, 1) = 0; /* force short packet */ + } /* set final frame length */ nth16 = (struct usb_cdc_ncm_nth16 *)skb_out->data;