>From zhenyu.z.wang@xxxxxxxxx Fix oops from nonlinear skb usage. Signed-off-by: Alex Aizman <itn780@xxxxxxxxx> Signed-off-by: Dmitry Yusupov <dmitry_yus@xxxxxxxxx> Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx> diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c @@ -1061,7 +1061,6 @@ iscsi_tcp_data_recv(read_descriptor_t *r { int rc; struct iscsi_conn *conn = rd_desc->arg.data; - int start = skb_headlen(skb); int processed; char pad[ISCSI_PAD_LEN]; struct scatterlist sg; @@ -1070,7 +1069,7 @@ iscsi_tcp_data_recv(read_descriptor_t *r * Save current SKB and its offset in the corresponding * connection context. */ - conn->in.copy = start - offset; + conn->in.copy = skb->len - offset; conn->in.offset = offset; conn->in.skb = skb; conn->in.len = conn->in.copy; - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html